Permalink
Browse files

use uppercase names for global variables MOUNT and SDCARD

  • Loading branch information...
1 parent e92828e commit cd06793def64ac52a57379fa79d0de08bb55aff3 @zador-blood-stained zador-blood-stained committed Nov 26, 2016
View
@@ -121,14 +121,14 @@ for line in "${buildlist[@]}"; do
CPUMIN CPUMAX UBOOT_VER KERNEL_VER GOVERNOR BOOTSIZE UBOOT_TOOLCHAIN KERNEL_TOOLCHAIN PACKAGE_LIST_EXCLUDE KERNEL_IMAGE_TYPE \
write_uboot_platform family_tweaks setup_write_uboot_platform BOOTSCRIPT UBOOT_FILES LOCALVERSION UBOOT_COMPILER KERNEL_COMPILER \
UBOOT_TARGET MODULES MODULES_NEXT MODULES_DEV INITRD_ARCH HAS_UUID_SUPPORT BOOTENV_FILE BOOTDELAY MODULES_BLACKLIST MODULES_BLACKLIST_NEXT \
- MODULES_BLACKLIST_DEV sdcard mount buildtext
+ MODULES_BLACKLIST_DEV MOUNT SDCARD buildtext
read BOARD BRANCH RELEASE BUILD_DESKTOP <<< $line
n=$[$n+1]
if [[ $from -le $n ]]; then
- touch "/run/armbian/Armbian_${BOARD^}_${BRANCH}_${RELEASE}_$BUILD_DESKTOP.pid"
+ touch "/run/armbian/Armbian_${BOARD^}_${BRANCH}_${RELEASE}_$BUILD_DESKTOP.pid"
jobs=$(ls /run/armbian | wc -l)
if [[ $jobs -lt $free_cpu ]]; then
display_alert "Building in the back $n / ${#buildlist[@]}" "Board: $BOARD Kernel:$BRANCH${RELEASE:+ Release: $RELEASE}${BUILD_DESKTOP:+ Desktop: $BUILD_DESKTOP}" "ext"
@@ -261,13 +261,13 @@ chroot_installpackages_local()
-gpg-key="925644A6" -passphrase="testkey1234" -component=temp -distribution=$RELEASE publish repo temp
aptly -config=$conf -listen=":8189" serve &
local aptly_pid=$!
- cp $SRC/lib/extras-buildpkgs/buildpkg.key $CACHEDIR/$sdcard/tmp/buildpkg.key
- cat <<-'EOF' > $CACHEDIR/$sdcard/etc/apt/preferences.d/90-armbian-temp.pref
+ cp $SRC/lib/extras-buildpkgs/buildpkg.key $CACHEDIR/$SDCARD/tmp/buildpkg.key
+ cat <<-'EOF' > $CACHEDIR/$SDCARD/etc/apt/preferences.d/90-armbian-temp.pref
Package: *
Pin: origin "localhost"
Pin-Priority: 550
EOF
- cat <<-EOF > $CACHEDIR/$sdcard/etc/apt/sources.list.d/armbian-temp.list
+ cat <<-EOF > $CACHEDIR/$SDCARD/etc/apt/sources.list.d/armbian-temp.list
deb http://localhost:8189/ $RELEASE temp
EOF
chroot_installpackages
@@ -288,7 +288,7 @@ chroot_installpackages()
unset package_install_target package_checkinstall
done
[[ $NO_APT_CACHER != yes ]] && local apt_extra="-o Acquire::http::Proxy=\"http://${APT_PROXY_ADDR:-localhost:3142}\" -o Acquire::http::Proxy::localhost=\"DIRECT\""
- cat <<-EOF > $CACHEDIR/$sdcard/tmp/install.sh
+ cat <<-EOF > $CACHEDIR/$SDCARD/tmp/install.sh
#!/bin/bash
[[ "$remote_only" != yes ]] && apt-key add /tmp/buildpkg.key
apt-get $apt_extra -q update
@@ -308,6 +308,6 @@ chroot_installpackages()
rm /tmp/buildpkg.key 2>/dev/null
rm -- "\$0"
EOF
- chmod +x $CACHEDIR/$sdcard/tmp/install.sh
- chroot $CACHEDIR/$sdcard /bin/bash -c "/tmp/install.sh"
+ chmod +x $CACHEDIR/$SDCARD/tmp/install.sh
+ chroot $CACHEDIR/$SDCARD /bin/bash -c "/tmp/install.sh"
} #############################################################################
View
@@ -397,19 +397,19 @@ customize_image()
{
# for users that need to prepare files at host
[[ -f $SRC/userpatches/customize-image-host.sh ]] && source $SRC/userpatches/customize-image-host.sh
- cp $SRC/userpatches/customize-image.sh $CACHEDIR/$sdcard/tmp/customize-image.sh
- chmod +x $CACHEDIR/$sdcard/tmp/customize-image.sh
- mkdir -p $CACHEDIR/$sdcard/tmp/overlay
+ cp $SRC/userpatches/customize-image.sh $CACHEDIR/$SDCARD/tmp/customize-image.sh
+ chmod +x $CACHEDIR/$SDCARD/tmp/customize-image.sh
+ mkdir -p $CACHEDIR/$SDCARD/tmp/overlay
if [[ $(lsb_release -sc) == xenial ]]; then
# util-linux >= 2.27 required
- mount -o bind,ro $SRC/userpatches/overlay $CACHEDIR/$sdcard/tmp/overlay
+ mount -o bind,ro $SRC/userpatches/overlay $CACHEDIR/$SDCARD/tmp/overlay
else
- mount -o bind $SRC/userpatches/overlay $CACHEDIR/$sdcard/tmp/overlay
+ mount -o bind $SRC/userpatches/overlay $CACHEDIR/$SDCARD/tmp/overlay
fi
display_alert "Calling image customization script" "customize-image.sh" "info"
- chroot $CACHEDIR/$sdcard /bin/bash -c "/tmp/customize-image.sh $RELEASE $FAMILY $BOARD $BUILD_DESKTOP"
- umount $CACHEDIR/$sdcard/tmp/overlay
- mountpoint -q $CACHEDIR/$sdcard/tmp/overlay || rm -r $CACHEDIR/$sdcard/tmp/overlay
+ chroot $CACHEDIR/$SDCARD /bin/bash -c "/tmp/customize-image.sh $RELEASE $FAMILY $BOARD $BUILD_DESKTOP"
+ umount $CACHEDIR/$SDCARD/tmp/overlay
+ mountpoint -q $CACHEDIR/$SDCARD/tmp/overlay || rm -r $CACHEDIR/$SDCARD/tmp/overlay
}
userpatch_create()
@@ -44,14 +44,14 @@ write_uboot_platform()
family_tweaks()
{
# default lirc configuration
- sed -e 's/DEVICE=""/DEVICE="\/dev\/lirc0"/g' -i $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="default"/g' -i $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- cp $SRC/lib/config/lirc.conf.cubox-i $CACHEDIR/$sdcard/etc/lirc/lircd.conf
- install -m 755 $SRC/lib/bin/brcm_patchram_plus_cubox $CACHEDIR/$sdcard/usr/local/bin/brcm_patchram_plus
- cp $SRC/lib/scripts/brcm4330 $CACHEDIR/$sdcard/etc/default
- install -m 755 $SRC/lib/scripts/brcm4330-patch $CACHEDIR/$sdcard/etc/init.d/brcm4330-patch
- #chroot $CACHEDIR/$sdcard /bin/bash -c "LC_ALL=C LANG=C update-rc.d brcm4330-patch defaults>> /dev/null"
- if [[ $BRANCH == next && -f $CACHEDIR/$sdcard/boot/boot.cmd ]]; then
- sed -e 's/console=tty1 //g' -i $CACHEDIR/$sdcard/boot/boot.cmd
+ sed -e 's/DEVICE=""/DEVICE="\/dev\/lirc0"/g' -i $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="default"/g' -i $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ cp $SRC/lib/config/lirc.conf.cubox-i $CACHEDIR/$SDCARD/etc/lirc/lircd.conf
+ install -m 755 $SRC/lib/bin/brcm_patchram_plus_cubox $CACHEDIR/$SDCARD/usr/local/bin/brcm_patchram_plus
+ cp $SRC/lib/scripts/brcm4330 $CACHEDIR/$SDCARD/etc/default
+ install -m 755 $SRC/lib/scripts/brcm4330-patch $CACHEDIR/$SDCARD/etc/init.d/brcm4330-patch
+ #chroot $CACHEDIR/$SDCARD /bin/bash -c "LC_ALL=C LANG=C update-rc.d brcm4330-patch defaults>> /dev/null"
+ if [[ $BRANCH == next && -f $CACHEDIR/$SDCARD/boot/boot.cmd ]]; then
+ sed -e 's/console=tty1 //g' -i $CACHEDIR/$SDCARD/boot/boot.cmd
fi
}
@@ -42,5 +42,5 @@ write_uboot_platform()
family_tweaks()
{
- chroot $CACHEDIR/$sdcard /bin/bash -c "apt-get -y -qq remove --auto-remove lirc linux-sound-base alsa-base alsa-utils bluez>/dev/null 2>&1"
+ chroot $CACHEDIR/$SDCARD /bin/bash -c "apt-get -y -qq remove --auto-remove lirc linux-sound-base alsa-base alsa-utils bluez>/dev/null 2>&1"
}
@@ -39,8 +39,8 @@ write_uboot_platform()
family_tweaks()
{
- install -m 755 $SRC/lib/scripts/c1_init.sh $CACHEDIR/$sdcard/etc/
- sed -e 's/exit 0//g' -i $CACHEDIR/$sdcard/etc/rc.local
- echo "/etc/c1_init.sh" >> $CACHEDIR/$sdcard/etc/rc.local
- echo "exit 0" >> $CACHEDIR/$sdcard/etc/rc.local
+ install -m 755 $SRC/lib/scripts/c1_init.sh $CACHEDIR/$SDCARD/etc/
+ sed -e 's/exit 0//g' -i $CACHEDIR/$SDCARD/etc/rc.local
+ echo "/etc/c1_init.sh" >> $CACHEDIR/$SDCARD/etc/rc.local
+ echo "exit 0" >> $CACHEDIR/$SDCARD/etc/rc.local
}
@@ -33,14 +33,14 @@ write_uboot_platform()
family_tweaks()
{
- sed -i 's/MODULES=.*/MODULES="meson-ir"/' $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -i 's/LOAD_MODULES=.*/LOAD_MODULES="true"/' $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -i 's/DEVICE=.*/DEVICE="\/dev\/lirc0"/' $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -i 's/LIRCD_ARGS=.*/LIRCD_ARGS="--uinput"/' $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- cp $SRC/lib/config/lirc.conf.odroidc2 $CACHEDIR/$sdcard/etc/lirc/lircd.conf
-
- install -m 755 $SRC/lib/scripts/c2_init.sh $CACHEDIR/$sdcard/etc/
- sed -e 's/exit 0//g' -i $CACHEDIR/$sdcard/etc/rc.local
- echo "/etc/c2_init.sh" >> $CACHEDIR/$sdcard/etc/rc.local
- echo "exit 0" >> $CACHEDIR/$sdcard/etc/rc.local
+ sed -i 's/MODULES=.*/MODULES="meson-ir"/' $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -i 's/LOAD_MODULES=.*/LOAD_MODULES="true"/' $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -i 's/DEVICE=.*/DEVICE="\/dev\/lirc0"/' $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -i 's/LIRCD_ARGS=.*/LIRCD_ARGS="--uinput"/' $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ cp $SRC/lib/config/lirc.conf.odroidc2 $CACHEDIR/$SDCARD/etc/lirc/lircd.conf
+
+ install -m 755 $SRC/lib/scripts/c2_init.sh $CACHEDIR/$SDCARD/etc/
+ sed -e 's/exit 0//g' -i $CACHEDIR/$SDCARD/etc/rc.local
+ echo "/etc/c2_init.sh" >> $CACHEDIR/$SDCARD/etc/rc.local
+ echo "exit 0" >> $CACHEDIR/$SDCARD/etc/rc.local
}
@@ -61,6 +61,6 @@ write_uboot_platform()
family_tweaks()
{
- echo "blacklist ina231_sensor" > $CACHEDIR/$sdcard/etc/modprobe.d/blacklist-odroid.conf
- chroot $CACHEDIR/$sdcard /bin/bash -c "apt-get -y -qq remove --auto-remove lirc >/dev/null 2>&1"
+ echo "blacklist ina231_sensor" > $CACHEDIR/$SDCARD/etc/modprobe.d/blacklist-odroid.conf
+ chroot $CACHEDIR/$SDCARD /bin/bash -c "apt-get -y -qq remove --auto-remove lirc >/dev/null 2>&1"
}
@@ -55,7 +55,7 @@ write_uboot_platform()
family_tweaks()
{
if [[ $BRANCH == default ]]; then
- mkdir -p $CACHEDIR/$sdcard/var/lib/alsa/
- cp $SRC/lib/config/asound.state.pine64-default $CACHEDIR/$sdcard/var/lib/alsa/asound.state
+ mkdir -p $CACHEDIR/$SDCARD/var/lib/alsa/
+ cp $SRC/lib/config/asound.state.pine64-default $CACHEDIR/$SDCARD/var/lib/alsa/asound.state
fi
}
@@ -38,7 +38,7 @@ write_uboot_platform()
family_tweaks()
{
- printf "blacklist wlan_8723bs_vq0\nblacklist ctp_gslX680\nblacklist ctp_gsl3680\n" > $CACHEDIR/$sdcard/etc/modprobe.d/blacklist-guitar.conf
- printf "blacklist gsensor_mir3da\nblacklist gsensor_stk8313\nblacklist gsensor_bma222\nblacklist lightsensor_ltr301\n" >> $CACHEDIR/$sdcard/etc/modprobe.d/blacklist-guitar.conf
- gzip < $SRC/lib/bin/armbian-u-boot.bmp > $CACHEDIR/$sdcard/boot/boot_logo.bmp.gz
+ printf "blacklist wlan_8723bs_vq0\nblacklist ctp_gslX680\nblacklist ctp_gsl3680\n" > $CACHEDIR/$SDCARD/etc/modprobe.d/blacklist-guitar.conf
+ printf "blacklist gsensor_mir3da\nblacklist gsensor_stk8313\nblacklist gsensor_bma222\nblacklist lightsensor_ltr301\n" >> $CACHEDIR/$SDCARD/etc/modprobe.d/blacklist-guitar.conf
+ gzip < $SRC/lib/bin/armbian-u-boot.bmp > $CACHEDIR/$SDCARD/boot/boot_logo.bmp.gz
}
@@ -29,11 +29,11 @@ family_tweaks()
# TODO: replace with udev rule
# default lirc configuration
sed -i '1i sed -i \x27s/DEVICE="\\/dev\\/input.*/DEVICE="\\/dev\\/input\\/\x27$str\x27"/g\x27 /etc/lirc/hardware.conf' \
- $CACHEDIR/$sdcard/etc/lirc/hardware.conf
+ $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
sed -i '1i str=$(cat /proc/bus/input/devices | grep "H: Handlers=sysrq rfkill kbd event" | awk \x27{print $(NF)}\x27)' \
- $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -i '1i # Cubietruck automatic lirc device detection by Igor Pecovnik' $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -e 's/DEVICE=""/DEVICE="\/dev\/input\/event1"/g' -i $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="devinput"/g' -i $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- cp $SRC/lib/config/lirc.conf.cubietruck $CACHEDIR/$sdcard/etc/lirc/lircd.conf
+ $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -i '1i # Cubietruck automatic lirc device detection by Igor Pecovnik' $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -e 's/DEVICE=""/DEVICE="\/dev\/input\/event1"/g' -i $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="devinput"/g' -i $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ cp $SRC/lib/config/lirc.conf.cubietruck $CACHEDIR/$SDCARD/etc/lirc/lircd.conf
}
@@ -38,15 +38,15 @@ family_tweaks()
# TODO: replace with udev rule
# default lirc configuration
sed -i '1i sed -i \x27s/DEVICE="\\/dev\\/input.*/DEVICE="\\/dev\\/input\\/\x27$str\x27"/g\x27 /etc/lirc/hardware.conf' \
- $CACHEDIR/$sdcard/etc/lirc/hardware.conf
+ $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
sed -i '1i str=$(cat /proc/bus/input/devices | grep "H: Handlers=sysrq rfkill kbd event" | awk \x27{print $(NF)}\x27)' \
- $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -i '1i # Cubietruck automatic lirc device detection by Igor Pecovnik' $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -e 's/DEVICE=""/DEVICE="\/dev\/input\/event1"/g' -i $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="devinput"/g' -i $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- cp $SRC/lib/config/lirc.conf.cubietruck $CACHEDIR/$sdcard/etc/lirc/lircd.conf
+ $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -i '1i # Cubietruck automatic lirc device detection by Igor Pecovnik' $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -e 's/DEVICE=""/DEVICE="\/dev\/input\/event1"/g' -i $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="devinput"/g' -i $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ cp $SRC/lib/config/lirc.conf.cubietruck $CACHEDIR/$SDCARD/etc/lirc/lircd.conf
if [[ $BRANCH == next ]]; then
- mkdir -p $CACHEDIR/$sdcard/var/lib/alsa/
- cp $SRC/lib/config/asound.state.sunxi-next $CACHEDIR/$sdcard/var/lib/alsa/asound.state
+ mkdir -p $CACHEDIR/$SDCARD/var/lib/alsa/
+ cp $SRC/lib/config/asound.state.sunxi-next $CACHEDIR/$SDCARD/var/lib/alsa/asound.state
fi
}
@@ -29,30 +29,30 @@ esac
family_tweaks()
{
# this is for legacy kernel only
- sed -e 's/DEVICE=""/DEVICE="\/dev\/lirc0"/g' -i $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -e 's/MODULES=""/MODULES="sunxi_cir"/g' -i $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="default"/g' -i $CACHEDIR/$sdcard/etc/lirc/hardware.conf
- cp $SRC/lib/config/lirc.conf.cubietruck $CACHEDIR/$sdcard/etc/lirc/lircd.conf
+ sed -e 's/DEVICE=""/DEVICE="\/dev\/lirc0"/g' -i $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -e 's/MODULES=""/MODULES="sunxi_cir"/g' -i $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ sed -e 's/DRIVER="UNCONFIGURED"/DRIVER="default"/g' -i $CACHEDIR/$SDCARD/etc/lirc/hardware.conf
+ cp $SRC/lib/config/lirc.conf.cubietruck $CACHEDIR/$SDCARD/etc/lirc/lircd.conf
if [[ $BRANCH == default ]]; then
- mkdir -p $CACHEDIR/$sdcard/var/lib/alsa/
- cp $SRC/lib/config/asound.state.sun8i-default $CACHEDIR/$sdcard/var/lib/alsa/asound.state
+ mkdir -p $CACHEDIR/$SDCARD/var/lib/alsa/
+ cp $SRC/lib/config/asound.state.sun8i-default $CACHEDIR/$SDCARD/var/lib/alsa/asound.state
fi
# enable serial gadget on OTG port since the board doesn't have Ethernet
if [[ ( $BOARD == orangepilite || $BOARD == nanopiair ) && $BRANCH == default && ( $RELEASE == jessie || $RELEASE == xenial ) ]]; then
- mkdir -p $CACHEDIR/$sdcard/etc/systemd/system/serial-getty@ttyGS0.service.d
- cat <<-EOF > $CACHEDIR/$sdcard/etc/systemd/system/serial-getty@ttyGS0.service.d/10-switch-role.conf
+ mkdir -p $CACHEDIR/$SDCARD/etc/systemd/system/serial-getty@ttyGS0.service.d
+ cat <<-EOF > $CACHEDIR/$SDCARD/etc/systemd/system/serial-getty@ttyGS0.service.d/10-switch-role.conf
[Service]
ExecStartPre=-/bin/sh -c "echo 2 > /sys/bus/platform/devices/sunxi_usb_udc/otg_role"
EOF
- chroot $CACHEDIR/$sdcard /bin/bash -c "systemctl --no-reload enable serial-getty@ttyGS0.service > /dev/null"
- echo "ttyGS0" >> $CACHEDIR/$sdcard/etc/securetty
+ chroot $CACHEDIR/$SDCARD /bin/bash -c "systemctl --no-reload enable serial-getty@ttyGS0.service > /dev/null"
+ echo "ttyGS0" >> $CACHEDIR/$SDCARD/etc/securetty
fi
# u-boot default is nonsec. Legacy requires sec, mainline requires nonsec for SMP
- if [[ ! -f $CACHEDIR/$sdcard/boot/armbianEnv.txt ]]; then
+ if [[ ! -f $CACHEDIR/$SDCARD/boot/armbianEnv.txt ]]; then
local boot_mode=nonsec
[[ $BRANCH == default ]] && boot_mode=sec
sed -i -e "1s/^/gpio set PL10\ngpio set PG11\nsetenv machid 1029\nsetenv bootm_boot_mode $boot_mode\n/" \
- -e 's/\ disp.screen0_output_mode=1920x1080p60//' -e 's/\ hdmi.audio=EDID:0//' $CACHEDIR/$sdcard/boot/boot.cmd
+ -e 's/\ disp.screen0_output_mode=1920x1080p60//' -e 's/\ hdmi.audio=EDID:0//' $CACHEDIR/$SDCARD/boot/boot.cmd
fi
}
@@ -44,18 +44,18 @@ write_uboot_platform()
family_tweaks()
{
- chroot $CACHEDIR/$sdcard /bin/bash -c "apt-get -y -qq remove --auto-remove lirc >/dev/null 2>&1"
- sed 's/wlan0/wlan2/' -i $CACHEDIR/$sdcard/etc/network/interfaces.default
- sed 's/wlan0/wlan2/' -i $CACHEDIR/$sdcard/etc/network/interfaces.bonding
- sed 's/wlan0/wlan2/' -i $CACHEDIR/$sdcard/etc/network/interfaces.hostapd
+ chroot $CACHEDIR/$SDCARD /bin/bash -c "apt-get -y -qq remove --auto-remove lirc >/dev/null 2>&1"
+ sed 's/wlan0/wlan2/' -i $CACHEDIR/$SDCARD/etc/network/interfaces.default
+ sed 's/wlan0/wlan2/' -i $CACHEDIR/$SDCARD/etc/network/interfaces.bonding
+ sed 's/wlan0/wlan2/' -i $CACHEDIR/$SDCARD/etc/network/interfaces.hostapd
if [[ $BOARD == udoo-neo ]]; then
# SD card is elsewhere
- sed 's/mmcblk0p1/mmcblk1p1/' -i $CACHEDIR/$sdcard/etc/fstab
+ sed 's/mmcblk0p1/mmcblk1p1/' -i $CACHEDIR/$SDCARD/etc/fstab
# firmware for M4
- mkdir -p $CACHEDIR/$sdcard/boot/bin/
- cp $SRC/lib/bin/m4startup.fw* $CACHEDIR/$sdcard/boot/bin/
+ mkdir -p $CACHEDIR/$SDCARD/boot/bin/
+ cp $SRC/lib/bin/m4startup.fw* $CACHEDIR/$SDCARD/boot/bin/
# fix for BT
- cp $SRC/lib/bin/udoo-neo-debs/udooneo-bluetooth_1.2-1_armhf.deb $CACHEDIR/$sdcard/tmp
- chroot $CACHEDIR/$sdcard /bin/bash -c "dpkg -i /tmp/udooneo-bluetooth_1.2-1_armhf.deb >/dev/null 2>&1"
+ cp $SRC/lib/bin/udoo-neo-debs/udooneo-bluetooth_1.2-1_armhf.deb $CACHEDIR/$SDCARD/tmp
+ chroot $CACHEDIR/$SDCARD /bin/bash -c "dpkg -i /tmp/udooneo-bluetooth_1.2-1_armhf.deb >/dev/null 2>&1"
fi
}
@@ -44,18 +44,18 @@ write_uboot_platform()
family_tweaks()
{
- chroot $CACHEDIR/$sdcard /bin/bash -c "apt-get -y -qq remove --auto-remove lirc >/dev/null 2>&1"
- sed 's/wlan0/wlan2/' -i $CACHEDIR/$sdcard/etc/network/interfaces.default
- sed 's/wlan0/wlan2/' -i $CACHEDIR/$sdcard/etc/network/interfaces.bonding
- sed 's/wlan0/wlan2/' -i $CACHEDIR/$sdcard/etc/network/interfaces.hostapd
+ chroot $CACHEDIR/$SDCARD /bin/bash -c "apt-get -y -qq remove --auto-remove lirc >/dev/null 2>&1"
+ sed 's/wlan0/wlan2/' -i $CACHEDIR/$SDCARD/etc/network/interfaces.default
+ sed 's/wlan0/wlan2/' -i $CACHEDIR/$SDCARD/etc/network/interfaces.bonding
+ sed 's/wlan0/wlan2/' -i $CACHEDIR/$SDCARD/etc/network/interfaces.hostapd
if [[ $BOARD == udoo-neo ]]; then
# SD card is elsewhere
- sed 's/mmcblk0p1/mmcblk1p1/' -i $CACHEDIR/$sdcard/etc/fstab
+ sed 's/mmcblk0p1/mmcblk1p1/' -i $CACHEDIR/$SDCARD/etc/fstab
# firmware for M4
- mkdir -p $CACHEDIR/$sdcard/boot/bin/
- cp $SRC/lib/bin/m4startup.fw* $CACHEDIR/$sdcard/boot/bin/
+ mkdir -p $CACHEDIR/$SDCARD/boot/bin/
+ cp $SRC/lib/bin/m4startup.fw* $CACHEDIR/$SDCARD/boot/bin/
# fix for BT
- cp $SRC/lib/bin/udoo-neo-debs/udooneo-bluetooth_1.2-1_armhf.deb $CACHEDIR/$sdcard/tmp
- chroot $CACHEDIR/$sdcard /bin/bash -c "dpkg -i /tmp/udooneo-bluetooth_1.2-1_armhf.deb >/dev/null 2>&1"
+ cp $SRC/lib/bin/udoo-neo-debs/udooneo-bluetooth_1.2-1_armhf.deb $CACHEDIR/$SDCARD/tmp
+ chroot $CACHEDIR/$SDCARD /bin/bash -c "dpkg -i /tmp/udooneo-bluetooth_1.2-1_armhf.deb >/dev/null 2>&1"
fi
}
View
@@ -63,8 +63,8 @@ SERIALCON=ttyS0
BOOTSIZE=0
# set unique mounting directory
-sdcard="sdcard-${BRANCH}-${BOARD}-${RELEASE}"
-mount="mount-${BRANCH}-${BOARD}-${RELEASE}"
+SDCARD="sdcard-${BRANCH}-${BOARD}-${RELEASE}"
+MOUNT="mount-${BRANCH}-${BOARD}-${RELEASE}"
if [[ -f $SRC/lib/config/sources/$LINUXFAMILY.conf ]]; then
source $SRC/lib/config/sources/$LINUXFAMILY.conf
Oops, something went wrong.

0 comments on commit cd06793

Please sign in to comment.