enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop HAS_UUID_SUPPORT variable

Browse Source
This commit is contained in:
zador-blood-stained 2018-06-02 17:49:57 +03:00
parent f9d48776a5
commit caec848619
18 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/sources/cubox.conf
View File

@ -5,7 +5,6 @@ BOOTSCRIPT='boot-cubox.cmd:boot.cmd'
BOOTENV_FILE='cubox-default.txt'
UBOOT_TARGET_MAP=';;SPL u-boot.img'
HAS_UUID_SUPPORT=yes
UBOOT_USE_GCC='< 5.0'
case $BRANCH in
@ -63,7 +62,6 @@ if [[ $BOARD == wandboard-quad ]]; then
KERNEL_USE_GCC='> 6.3'
CPUMAX=1008000
GOVERNOR=ondemand
HAS_UUID_SUPPORT=yes
BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
BOOTDIR=$MAINLINE_UBOOT_DIR
BOOTBRANCH="branch:v2017.03"

2
config/sources/meson64.conf
View File

@ -6,8 +6,6 @@ UBOOT_USE_GCC='> 7.0'
UBOOT_TARGET_MAP="u-boot-dtb.img;;$SRC/packages/blobs/meson/u-boot-${BOARD}.bin:u-boot.bin u-boot-dtb.img"
BOOTSCRIPT="boot-meson64-${BOARD}.cmd:boot.cmd"
HAS_UUID_SUPPORT=yes
ARCH=arm64
KERNEL_IMAGE_TYPE=Image

2
config/sources/mvebu.conf
View File

@ -1,5 +1,3 @@
HAS_UUID_SUPPORT=yes
if [[ $BOARD == helios4 ]]; then
source "${BASH_SOURCE%/*}/mvebu-helios4.inc"
BOOTENV_FILE='helios4-default.txt'

1
config/sources/mvebu64.conf
View File

@ -11,7 +11,6 @@ BOOTBRANCH='branch:u-boot-2017.03-armada-17.10'
UBOOT_USE_GCC='< 7.0'
BOOTENV_FILE='clearfog-default.txt'
HAS_UUID_SUPPORT=yes
ATFSOURCE='https://github.com/MarvellEmbeddedProcessors/atf-marvell'
ATFDIR='arm-trusted-firmware-espressobin'

2
config/sources/odroidc1.conf
View File

@ -6,8 +6,6 @@ BOOTSCRIPT="boot-odroid-c1.ini:boot.ini"
UBOOT_TARGET_MAP=';;sd_fuse/bl1.bin.hardkernel sd_fuse/u-boot.bin'
HAS_UUID_SUPPORT=yes
KERNEL_IMAGE_TYPE=uImage
case $BRANCH in

1
config/sources/odroidc2.conf
View File

@ -1,6 +1,5 @@
ARCH=arm64
KERNEL_IMAGE_TYPE=Image
HAS_UUID_SUPPORT=yes
case $BRANCH in
default)

1
config/sources/odroidxu4.conf
View File

@ -2,7 +2,6 @@ BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
BOOTSCRIPT='boot-odroid-xu4-default.ini:boot.ini'
BOOTDIR='u-boot-odroidxu'
BOOTENV_FILE='odroidxu4-default.txt'
HAS_UUID_SUPPORT=yes
case $BRANCH in
default)

2
config/sources/rda8810.conf
View File

@ -20,8 +20,6 @@ KERNEL_USE_GCC='< 5.0'
CAN_BUILD_STRETCH=no
HAS_UUID_SUPPORT=yes
CPUMIN=329333
CPUMAX=988000

1
config/sources/rk3328.conf
View File

@ -12,7 +12,6 @@ BOOTSOURCE='https://github.com/ayufan-rock64/linux-u-boot'
BOOTDIR='u-boot-rk3328'
BOOTPATCHDIR="u-boot-rk3328-${BRANCH}"
HAS_UUID_SUPPORT=yes
BOOTDELAY=0
OVERLAY_PREFIX='rk3328'

1
config/sources/rk3399.conf
View File

@ -13,7 +13,6 @@ BOOTBRANCH='branch:odroidn1-v2017.07'
BOOTDIR='u-boot-rk3399'
BOOTPATCHDIR="u-boot-rk3399-${BRANCH}"
HAS_UUID_SUPPORT=yes
BOOTDELAY=0
OVERLAY_PREFIX='rk3328'

1
config/sources/rockchip.conf
View File

@ -5,7 +5,6 @@ UBOOT_TARGET_MAP=";;$SRC/packages/blobs/rockchip/rk3288_boot.bin u-boot-rockchip
UBOOT_USE_GCC='> 6.3'
HAS_UUID_SUPPORT=yes
BOOTDELAY=0
BOOTSOURCE=$MAINLINE_UBOOT_SOURCE

2
config/sources/s5p6818.conf
View File

@ -47,8 +47,6 @@ KERNEL_USE_GCC='< 5.0'
CAN_BUILD_STRETCH=yes
HAS_UUID_SUPPORT=yes
GOVERNOR=ondemand
write_uboot_platform()

1
config/sources/sunxi64_common.inc
View File

@ -1,6 +1,5 @@
ARCH=arm64
KERNEL_IMAGE_TYPE=Image
HAS_UUID_SUPPORT=yes
BOOTDELAY=1
# Here we want to rename LINUXFAMILY from sun50iw1, sun50iw2, etc for next and dev branches

1
config/sources/sunxi_common.inc
View File

@ -10,7 +10,6 @@ UBOOT_TARGET_MAP=';;u-boot-sunxi-with-spl.bin'
UBOOT_USE_GCC='> 7.0'
UBOOT_FW_ENV='0x88000,0x20000' # /etc/fw_env.config offset and env size
HAS_UUID_SUPPORT=yes
BOOTDELAY=1
# Here we want to rename LINUXFAMILY from sun4i, sun5i, etc for next and dev branches

1
config/sources/udoo-neo.conf
View File

@ -3,7 +3,6 @@ BOOTDIR='u-boot-udoo'
BOOTPATCHDIR='u-boot-udoo'
BOOTSCRIPT="boot-$BOARD.cmd:boot.cmd"
BOOTENV_FILE='udoo-neo-default.txt'
HAS_UUID_SUPPORT=yes
UBOOT_TARGET_MAP=';;SPL u-boot.img'
UBOOT_USE_GCC='> 5.0'

1
config/sources/udoo.conf
View File

@ -2,7 +2,6 @@ BOOTSOURCE='https://github.com/UDOOboard/uboot-imx'
BOOTDIR='u-boot-udoo'
BOOTSCRIPT="boot-$BOARD.cmd:boot.cmd"
BOOTENV_FILE='udoo-default.txt'
HAS_UUID_SUPPORT=yes
UBOOT_TARGET_MAP=';;SPL u-boot.img'
UBOOT_USE_GCC='> 5.0'

2
lib/build-all.sh
View File

@ -207,7 +207,7 @@ for line in "${buildlist[@]}"; do
CPUMIN CPUMAX UBOOT_VER KERNEL_VER GOVERNOR BOOTSIZE BOOTFS_TYPE UBOOT_TOOLCHAIN KERNEL_TOOLCHAIN PACKAGE_LIST_EXCLUDE KERNEL_IMAGE_TYPE \
write_uboot_platform family_tweaks family_tweaks_bsp setup_write_uboot_platform uboot_custom_postprocess atf_custom_postprocess family_tweaks_s \
BOOTSCRIPT UBOOT_TARGET_MAP LOCALVERSION UBOOT_COMPILER KERNEL_COMPILER BOOTCONFIG BOOTCONFIG_VAR_NAME BOOTCONFIG_DEFAULT BOOTCONFIG_NEXT BOOTCONFIG_DEV \
MODULES MODULES_NEXT MODULES_DEV INITRD_ARCH HAS_UUID_SUPPORT BOOTENV_FILE BOOTDELAY MODULES_BLACKLIST MODULES_BLACKLIST_NEXT \
MODULES MODULES_NEXT MODULES_DEV INITRD_ARCH BOOTENV_FILE BOOTDELAY MODULES_BLACKLIST MODULES_BLACKLIST_NEXT \
MODULES_BLACKLIST_DEV MOUNT SDCARD BOOTPATCHDIR KERNELPATCHDIR buildtext RELEASE IMAGE_TYPE OVERLAY_PREFIX ASOUND_STATE \
ATF_COMPILER ATF_USE_GCC ATFSOURCE ATFDIR ATFBRANCH ATFSOURCEDIR PACKAGE_LIST_RM NM_IGNORE_DEVICES DISPLAY_MANAGER family_tweaks_bsp_s

8
lib/debootstrap-ng.sh
View File

@ -417,11 +417,7 @@ prepare_partitions()
# stage: adjust boot script or boot environment
if [[ -f $SDCARD/boot/armbianEnv.txt ]]; then
if [[ $HAS_UUID_SUPPORT == yes ]]; then
echo "rootdev=$rootfs" >> $SDCARD/boot/armbianEnv.txt
elif [[ $rootpart != 1 ]]; then
echo "rootdev=/dev/mmcblk0p${rootpart}" >> $SDCARD/boot/armbianEnv.txt
fi
echo "rootdev=$rootfs" >> $SDCARD/boot/armbianEnv.txt
echo "rootfstype=$ROOTFS_TYPE" >> $SDCARD/boot/armbianEnv.txt
elif [[ $rootpart != 1 ]]; then
local bootscript_dst=${BOOTSCRIPT##*:}
@ -433,7 +429,7 @@ prepare_partitions()
# if we have boot.ini = remove armbianEnv.txt and add UUID there if enabled
if [[ -f $SDCARD/boot/boot.ini ]]; then
sed -i -e "s/rootfstype \"ext4\"/rootfstype \"$ROOTFS_TYPE\"/" $SDCARD/boot/boot.ini
[[ $HAS_UUID_SUPPORT == yes ]] && sed -i 's/^setenv rootdev .*/setenv rootdev "'$rootfs'"/' $SDCARD/boot/boot.ini
sed -i 's/^setenv rootdev .*/setenv rootdev "'$rootfs'"/' $SDCARD/boot/boot.ini
[[ -f $SDCARD/boot/armbianEnv.txt ]] && rm $SDCARD/boot/armbianEnv.txt
fi