From ab028054071eab4443a229ba5025e8cb3c238b13 Mon Sep 17 00:00:00 2001 From: parazyd Date: Sat, 15 Oct 2016 00:44:54 +0200 Subject: [PATCH] don't clone linux-firmware, libdevuan takes care of this --- TODO.md | 1 + boards/bananapi.sh | 6 +++--- boards/bananapro.sh | 6 +++--- boards/beaglebone-black.sh | 6 +++--- boards/chromebook-acer.sh | 6 +++--- boards/cubieboard2.sh | 6 +++--- boards/cubietruck.sh | 6 +++--- boards/odroid-xu.sh | 6 +++--- boards/raspberry-pi2.sh | 6 +++--- boards/raspberry-pi3.sh | 6 +++--- sdk | 2 +- 11 files changed, 29 insertions(+), 28 deletions(-) diff --git a/TODO.md b/TODO.md index fc06ce0..df04131 100644 --- a/TODO.md +++ b/TODO.md @@ -2,4 +2,5 @@ things needed doing =================== * remove systemd from raspi-config and include it in builds +* figure out which firmware will never be used for each device * documentation diff --git a/boards/bananapi.sh b/boards/bananapi.sh index 5650bb1..a3e1829 100644 --- a/boards/bananapi.sh +++ b/boards/bananapi.sh @@ -119,9 +119,9 @@ build_kernel_armhf() { make INSTALL_MOD_PATH=$strapdir modules_install || zerr popd - sudo rm -rf $strapdir/lib/firmware - get-kernel-firmware - sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware + #sudo rm -rf $strapdir/lib/firmware + #get-kernel-firmware + #sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware pushd $R/tmp/kernels/$device_name/${device_name}-linux sudo -E PATH="$PATH" \ diff --git a/boards/bananapro.sh b/boards/bananapro.sh index da4f592..f15a59f 100644 --- a/boards/bananapro.sh +++ b/boards/bananapro.sh @@ -119,9 +119,9 @@ build_kernel_armhf() { make INSTALL_MOD_PATH=$strapdir modules_install || zerr popd - sudo rm -rf $strapdir/lib/firmware - get-kernel-firmware - sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware + #sudo rm -rf $strapdir/lib/firmware + #get-kernel-firmware + #sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware pushd $R/tmp/kernels/$device_name/${device_name}-linux sudo -E PATH="$PATH" \ diff --git a/boards/beaglebone-black.sh b/boards/beaglebone-black.sh index 8367a1c..954acb5 100644 --- a/boards/beaglebone-black.sh +++ b/boards/beaglebone-black.sh @@ -153,9 +153,9 @@ build_kernel_armhf() { make INSTALL_MOD_PATH=$strapdir modules_install || zerr popd - sudo rm -rf $strapdir/lib/firmware - get-kernel-firmware - sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware + #sudo rm -rf $strapdir/lib/firmware + #get-kernel-firmware + #sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware pushd $R/tmp/kernels/$device_name/${device_name}-linux sudo -E PATH="$PATH" \ diff --git a/boards/chromebook-acer.sh b/boards/chromebook-acer.sh index d421994..4061bf2 100644 --- a/boards/chromebook-acer.sh +++ b/boards/chromebook-acer.sh @@ -158,9 +158,9 @@ build_kernel_armhf() { make INSTALL_MOD_PATH=$strapdir modules_install || zerr popd - sudo rm -rf $strapdir/lib/firmware - get-kernel-firmware - sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware + #sudo rm -rf $strapdir/lib/firmware + #get-kernel-firmware + #sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware pushd $R/tmp/kernels/$device_name/${device_name}-linux/arch/arm/boot ## {{{ kernel-nyan.its diff --git a/boards/cubieboard2.sh b/boards/cubieboard2.sh index e383ac7..9ee805c 100644 --- a/boards/cubieboard2.sh +++ b/boards/cubieboard2.sh @@ -119,9 +119,9 @@ build_kernel_armhf() { make INSTALL_MOD_PATH=$strapdir modules_install || zerr popd - sudo rm -rf $strapdir/lib/firmware - get-kernel-firmware - sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware + #sudo rm -rf $strapdir/lib/firmware + #get-kernel-firmware + #sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware pushd $R/tmp/kernels/$device_name/${device_name}-linux sudo -E PATH="$PATH" \ diff --git a/boards/cubietruck.sh b/boards/cubietruck.sh index 8161815..d9dc622 100644 --- a/boards/cubietruck.sh +++ b/boards/cubietruck.sh @@ -119,9 +119,9 @@ build_kernel_armhf() { make INSTALL_MOD_PATH=$strapdir modules_install || zerr popd - sudo rm -rf $strapdir/lib/firmware - get-kernel-firmware - sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware + #sudo rm -rf $strapdir/lib/firmware + #get-kernel-firmware + #sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware pushd $R/tmp/kernels/$device_name/${device_name}-linux sudo -E PATH="$PATH" \ diff --git a/boards/odroid-xu.sh b/boards/odroid-xu.sh index d77df8a..9d83b26 100644 --- a/boards/odroid-xu.sh +++ b/boards/odroid-xu.sh @@ -144,9 +144,9 @@ build_kernel_armhf() { 's:^exit 0:exynos5-hwcomposer > /dev/null 2\&1 \&\nexit 0:' \ $strapdir/etc/rc.local - sudo rm -rf $strapdir/lib/firmware - get-kernel-firmware - sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware + #sudo rm -rf $strapdir/lib/firmware + #get-kernel-firmware + #sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware pushd $R/tmp/kernels/$device_name/${device_name}-linux sudo -E PATH="$PATH" \ diff --git a/boards/raspberry-pi2.sh b/boards/raspberry-pi2.sh index f5b3e2a..085a659 100644 --- a/boards/raspberry-pi2.sh +++ b/boards/raspberry-pi2.sh @@ -144,9 +144,9 @@ build_kernel_armhf() { sudo cp $CPVERBOSE arch/arm/boot/dts/overlays/README $strapdir/boot/overlays/ popd - sudo rm -rf $strapdir/lib/firmware - get-kernel-firmware - sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware + #sudo rm -rf $strapdir/lib/firmware + #get-kernel-firmware + #sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware pushd $R/tmp/kernels/$device_name/${device_name}-linux sudo -E PATH="$PATH" \ diff --git a/boards/raspberry-pi3.sh b/boards/raspberry-pi3.sh index 3ee461e..0ee28ae 100644 --- a/boards/raspberry-pi3.sh +++ b/boards/raspberry-pi3.sh @@ -123,9 +123,9 @@ build_kernel_arm64() { sudo cp $CPVERBOSE arch/arm64/boot/dts/overlays/README $strapdir/boot/overlays/ popd - sudo rm -rf $strapdir/lib/firmware - get-kernel-firmware - sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware + #sudo rm -rf $strapdir/lib/firmware + #get-kernel-firmware + #sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware pushd $R/tmp/kernels/$device_name/${device_name}-linux sudo -E PATH="$PATH" \ diff --git a/sdk b/sdk index b771bea..2a88e87 100755 --- a/sdk +++ b/sdk @@ -34,7 +34,7 @@ QUIET=0 } -source lib/zuper/zuper +source $R/lib/zuper/zuper ## global vars vars+=(armsdk_version)