Explorar o código

Remove firmware prior to packaging

Generalize source location

Change-Id: Ifa9951fe775156a9b49af7e116a840e2c0a30bd9
Donald Carr %!s(int64=8) %!d(string=hai) anos
pai
achega
98db00b6ba
Modificáronse 1 ficheiros con 12 adicións e 5 borrados
  1. 12 5
      PKGBUILD

+ 12 - 5
PKGBUILD

@@ -3,22 +3,26 @@
 # set -x
 
 pkgname=linux-spudd
-provides=("linux-spudd" "linux-firmware")
+provides=("linux-spudd")
+# The firmware the kernel produces blows: don't falsify this lightly
+# "linux-firmware=20170309.695f2d6-1"
+#conflicts=("linux-firmware")
 pkgrel=1
-pkgver=4.11.rc3.r6.g4c4c9bb32aaa
+pkgver=4.11.rc7.r54.gd0f2f5a8e2f1
 pkgdesc="Kernel build from head"
 arch=("x86_64")
 license=("GPL2.1")
 install=spudd.install
 _xcompile_args="ARCH=arm64 CROSS_COMPILE=/opt/aarch64-rpi3-linux-gnueabi/bin/aarch64-rpi3-linux-gnueabi-"
+_kernel_src_dir=/opt/dev/src/OSS/linux
 
 pkgver() {
-  cd /opt/dev/src/OSS/linux/linux
+  cd $_kernel_src_dir
   git describe --tags | cut -c2- | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd /opt/dev/src/OSS/linux/linux
+  cd $_kernel_src_dir
   #git clean -xdff
   make
 }
@@ -26,12 +30,15 @@ build() {
 package() {
   boot_dir="${pkgdir}/boot"
   usr_dir="${pkgdir}/usr"
+  firmware_dir="${usr_dir}/lib/firmware"
   preset_dir=${pkgdir}/etc/mkinitcpio.d
 
-  cd /opt/dev/src/OSS/linux/linux
+  cd $_kernel_src_dir
   INSTALL_MOD_PATH=${usr_dir} make modules_install
   mkdir -p ${boot_dir}
   mkdir -p ${preset_dir}
   cp arch/x86/boot/bzImage ${boot_dir}/vmlinuz-spudd
   cp ${startdir}/spudd.preset ${preset_dir}
+
+  mv ${firmware_dir} ${startdir}
 }