Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-11 19:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove more unneeded raspi3 conditionals.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2018-11-02 09:27:01 +01:00
parent 2e3c7d050c
commit b0910cbe50
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
live-build/auto/build
View File

@ -609,7 +609,7 @@ case $PROJECT:${SUBPROJECT:-} in
fi fi
;; ;;
armhf) armhf)
if [ "$devarch" = "raspi2" ] || [ "$devarch" = "raspi3" ]; then if [ "$devarch" = "raspi2" ]; then
linux_package="linux-image-raspi2" linux_package="linux-image-raspi2"
fi fi
;; ;;
@ -678,7 +678,7 @@ case $PROJECT:${SUBPROJECT:-} in
if [ -n "$dtbs" ]; then if [ -n "$dtbs" ]; then
mv "$dtbs" $TMPDIR/assets/dtbs mv "$dtbs" $TMPDIR/assets/dtbs
case $devarch in case $devarch in
raspi2|raspi3) raspi2)
# ubuntu-device-flash does not like subdirs here, we need to tar it up # ubuntu-device-flash does not like subdirs here, we need to tar it up
if [ -e $TMPDIR/assets/dtbs/overlays ]; then if [ -e $TMPDIR/assets/dtbs/overlays ]; then
tar -C $TMPDIR/assets/dtbs -f $TMPDIR/assets/dtbs/overlays.tgz -czv overlays tar -C $TMPDIR/assets/dtbs -f $TMPDIR/assets/dtbs/overlays.tgz -czv overlays
@ -725,9 +725,6 @@ EOF
if [ "$devarch" = "raspi2" ];then if [ "$devarch" = "raspi2" ];then
tarname="raspi2.$tarname" tarname="raspi2.$tarname"
manifestname="$devarch.$manifestname" manifestname="$devarch.$manifestname"
elif [ "$devarch" = "raspi3" ];then
tarname="raspi3.$tarname"
manifestname="$devarch.$manifestname"
elif [ "$devarch" = "dragonboard" ];then elif [ "$devarch" = "dragonboard" ];then
tarname="$devarch.$tarname" tarname="$devarch.$tarname"
manifestname="$devarch.$manifestname" manifestname="$devarch.$manifestname"
@ -757,9 +754,6 @@ EOF
if [ "$devarch" = "raspi2" ];then if [ "$devarch" = "raspi2" ];then
metaname=canonical-pi2-linux metaname=canonical-pi2-linux
snapname="$devarch.kernel.snap" snapname="$devarch.kernel.snap"
elif [ "$devarch" = "raspi3" ];then
metaname=canonical-pi3-linux
snapname="$devarch.kernel.snap"
elif [ "$devarch" = "generic" ] && [ "$ARCH" = "armhf" ];then elif [ "$devarch" = "generic" ] && [ "$ARCH" = "armhf" ];then
metaname=canonical-bbb-linux metaname=canonical-bbb-linux
elif [ "$devarch" = "dragonboard" ] && [ "$ARCH" = "arm64" ];then elif [ "$devarch" = "dragonboard" ] && [ "$ARCH" = "arm64" ];then