GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-03-28 17:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small refactoring

Browse source
This commit is contained in:
zador-blood-stained 2017-02-11 18:46:25 +03:00
parent 860d5772fe
commit bfe58bfeb1
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configuration.sh
View file

@ -48,12 +48,10 @@ if [[ $USE_GITHUB_UBOOT_MIRROR == yes ]]; then
else else
MAINLINE_UBOOT_SOURCE='git://git.denx.de/u-boot.git' MAINLINE_UBOOT_SOURCE='git://git.denx.de/u-boot.git'
fi fi
#MAINLINE_UBOOT_BRANCH="v$(git ls-remote git://git.denx.de/u-boot.git | grep -v rc | grep -v '\^' | tail -1 | cut -d'v' -f 2)"
MAINLINE_UBOOT_BRANCH='tag:v2017.01' MAINLINE_UBOOT_BRANCH='tag:v2017.01'
MAINLINE_UBOOT_DIR='u-boot' MAINLINE_UBOOT_DIR='u-boot'
# Let's set default data if not defined in board configuration above # Let's set default data if not defined in board configuration above
OFFSET=1 # Bootloader space in MB (1 x 2048 = default) OFFSET=1 # Bootloader space in MB (1 x 2048 = default)
ARCH=armhf ARCH=armhf
KERNEL_IMAGE_TYPE=zImage KERNEL_IMAGE_TYPE=zImage
@ -67,11 +65,10 @@ SDCARD="sdcard-${BRANCH}-${BOARD}-${RELEASE}-${BUILD_DESKTOP}"
MOUNT="mount-${BRANCH}-${BOARD}-${RELEASE}-${BUILD_DESKTOP}" MOUNT="mount-${BRANCH}-${BOARD}-${RELEASE}-${BUILD_DESKTOP}"
DESTIMG="image-${BRANCH}-${BOARD}-${RELEASE}-${BUILD_DESKTOP}" DESTIMG="image-${BRANCH}-${BOARD}-${RELEASE}-${BUILD_DESKTOP}"
if [[ -f $SRC/lib/config/sources/$LINUXFAMILY.conf ]]; then [[ ! -f $SRC/lib/config/sources/$LINUXFAMILY.conf ]] && \
source $SRC/lib/config/sources/$LINUXFAMILY.conf
else
exit_with_error "Sources configuration not found" "$LINUXFAMILY" exit_with_error "Sources configuration not found" "$LINUXFAMILY"
fi
source $SRC/lib/config/sources/$LINUXFAMILY.conf
if [[ -f $SRC/userpatches/sources/$LINUXFAMILY.conf ]]; then if [[ -f $SRC/userpatches/sources/$LINUXFAMILY.conf ]]; then
display_alert "Adding user provided $LINUXFAMILY overrides" display_alert "Adding user provided $LINUXFAMILY overrides"
@ -98,13 +95,11 @@ esac
# Here we want to use linux-sunxi-next and linux-sunxi-dev configs for sun*i # Here we want to use linux-sunxi-next and linux-sunxi-dev configs for sun*i
# except for sun8i-dev which is separate from sunxi-dev # except for sun8i-dev which is separate from sunxi-dev
if [[ $LINUXFAMILY == sun*i && $BRANCH != default && ! ( $LINUXFAMILY == sun8i && $BRANCH == dev ) ]]; then [[ $LINUXFAMILY == sun*i && $BRANCH != default && ! ( $LINUXFAMILY == sun8i && $BRANCH == dev ) ]] && \
LINUXCONFIG="linux-sunxi-${BRANCH}" LINUXCONFIG="linux-sunxi-${BRANCH}"
fi
[[ -z $LINUXCONFIG ]] && LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}" [[ -z $LINUXCONFIG ]] && LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}"
# naming to distro
if [[ $RELEASE == xenial ]]; then DISTRIBUTION="Ubuntu"; else DISTRIBUTION="Debian"; fi if [[ $RELEASE == xenial ]]; then DISTRIBUTION="Ubuntu"; else DISTRIBUTION="Debian"; fi
# temporary hacks/overrides # temporary hacks/overrides
@ -184,6 +179,7 @@ if [[ $ARCH == arm64 ]]; then
PACKAGE_LIST_DESKTOP="${PACKAGE_LIST_DESKTOP/firefox/firefox:armhf}" PACKAGE_LIST_DESKTOP="${PACKAGE_LIST_DESKTOP/firefox/firefox:armhf}"
fi fi
[[ $BUILD_DESKTOP == yes ]] && PACKAGE_LIST="$PACKAGE_LIST $PACKAGE_LIST_DESKTOP" [[ $BUILD_DESKTOP == yes ]] && PACKAGE_LIST="$PACKAGE_LIST $PACKAGE_LIST_DESKTOP"
# debug # debug
cat <<-EOF >> $DEST/debug/output.log cat <<-EOF >> $DEST/debug/output.log
## BUILD SCRIPT ENVIRONMENT ## BUILD SCRIPT ENVIRONMENT