From 19cc2fd2682b842a4d6a781e41b4246e2275087a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= Date: Mon, 9 Jun 2014 18:06:35 +0200 Subject: [PATCH] linux-seblu: Fix module compilation Since last update, module compilation was broken. Fix it by adding the old manually copied headers from kernel compilation --- PKGBUILD | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 121 insertions(+), 7 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index fe35e4b..da2d6c3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgname=linux-seblu pkgver=3.14 -pkgrel=1 +pkgrel=5 arch=('x86_64') license=('GPL2') url='http://www.kernel.org' @@ -71,17 +71,16 @@ package() { msg2 "Packing kernel release: $kernrel" msg2 "Packing kernel version: $pkgver" + # install kernel + install -D -m644 arch/x86/boot/bzImage "$pkgdir/usr/lib/kernel/vmlinuz-$kernrel" + # installing modules # disable DEPMOD because it fail due to poor hack in scripts/depmod.sh # and it's done by kernel-install in .install make INSTALL_MOD_PATH="$pkgdir/usr" DEPMOD=/bin/true modules_install - # install headers - make INSTALL_HDR_PATH="$pkgdir/usr/src/linux-$kernrel" headers_install - ln -sf ../../../src/linux-$kernrel "$pkgdir/usr/lib/modules/$kernrel/build" - - # install kernel and map - install -D -m644 arch/x86/boot/bzImage "$pkgdir/usr/lib/kernel/vmlinuz-$kernrel" + # copy headers + copy_headers # remove build and source links rm -f "$pkgdir/usr/lib/modules/$kernrel"/{source,build} @@ -98,4 +97,119 @@ package() { find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; } +copy_headers() { + # create build symlink into /usr/lib/modules + ln -sf ../../../src/linux-$kernrel "$pkgdir/usr/lib/modules/$kernrel/build" + + # Copy kernel config files + cd "$srcdir"/linux + install -D -m644 Makefile "$pkgdir/usr/src/linux-$kernrel/Makefile" + install -D -m644 kernel/Makefile "$pkgdir/usr/src/linux-$kernrel/kernel/Makefile" + install -D -m644 .config "$pkgdir/usr/src/linux-$kernrel/.config" + for i in localversion*; do + install -m644 "$i" "$pkgdir/usr/src/linux-$kernrel/$i" + done + + # create include directory + install -d "$pkgdir/usr/src/linux-$kernrel/include" + + for i in acpi asm-generic config crypto drm generated linux math-emu \ + media net pcmcia scsi sound trace uapi video xen; do + cp -a include/$i "$pkgdir/usr/src/linux-$kernrel/include/" + done + + # remove unneeded architectures + for i in "$pkgdir/usr/src/linux-$kernrel"/arch/*; do + [[ "$i" == x86 ]] && continue + rm -rf "$i" + done + + # copy arch includes for external modules + install -d "$pkgdir/usr/src/linux-$kernrel/arch/x86" + cp -a arch/x86/include "$pkgdir/usr/src/linux-$kernrel/arch/x86/" + + # copy files necessary for later builds, like nvidia and vmware + cp Module.symvers "$pkgdir/usr/src/linux-$kernrel" + cp -a scripts "$pkgdir/usr/src/linux-$kernrel" + + # fix permissions on scripts dir + chmod og-w -R "$pkgdir/usr/src/linux-$kernrel/scripts" + install -d "$pkgdir/usr/src/linux-$kernrel/.tmp_versions" + + install -d "$pkgdir/usr/src/linux-$kernrel/arch/x86/kernel" + + cp arch/x86/Makefile "$pkgdir/usr/src/linux-$kernrel/arch/x86/" + cp arch/x86/kernel/asm-offsets.s "$pkgdir/usr/src/linux-$kernrel/arch/x86/kernel/" + + + # add docbook makefile + install -D -m644 Documentation/DocBook/Makefile "$pkgdir/usr/src/linux-$kernrel/Documentation/DocBook/Makefile" + + # add dm headers + install -d "$pkgdir/usr/src/linux-$kernrel/drivers/md" + cp drivers/md/*.h "$pkgdir/usr/src/linux-$kernrel/drivers/md" + + # add inotify.h + install -d "$pkgdir/usr/src/linux-$kernrel/include/linux" + cp include/linux/inotify.h "$pkgdir/usr/src/linux-$kernrel/include/linux/" + + # add wireless headers + install -d "$pkgdir/usr/src/linux-$kernrel/net/mac80211/" + cp net/mac80211/*.h "$pkgdir/usr/src/linux-$kernrel/net/mac80211/" + + # add dvb headers for external modules + # in reference to: + # http://bugs.archlinux.org/task/9912 + install -d "$pkgdir/usr/src/linux-$kernrel/drivers/media/dvb-core" + cp drivers/media/dvb-core/*.h "$pkgdir/usr/src/linux-$kernrel/drivers/media/dvb-core/" + + # add dvb headers for external modules + # in reference to: + # http://bugs.archlinux.org/task/11194 + install -d "$pkgdir/usr/src/linux-$kernrel/include/config/dvb/" + cp include/config/dvb/*.h "$pkgdir/usr/src/linux-$kernrel/include/config/dvb/" + + # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new + # in reference to: + # http://bugs.archlinux.org/task/13146 + install -Dm644 drivers/media/dvb-frontends/lgdt330x.h \ + "$pkgdir/usr/src/linux-$kernrel/drivers/media/dvb-frontends/dvb-frontends/lgdt330x.h" + install -Dm644 drivers/media/i2c/msp3400-driver.h \ + "$pkgdir/usr/src/linux-$kernrel/drivers/media/i2c/msp3400-driver.h" + + # add dvb headers + # in reference to: + # http://bugs.archlinux.org/task/20402 + install -d "$pkgdir/usr/src/linux-$kernrel/drivers/media/usb/dvb-usb" + cp drivers/media/usb/dvb-usb/*.h "$pkgdir/usr/src/linux-$kernrel/drivers/media/usb/dvb-usb/" + install -d "$pkgdir/usr/src/linux-$kernrel/drivers/media/dvb-frontends" + cp drivers/media/dvb-frontends/*.h "$pkgdir/usr/src/linux-$kernrel/drivers/media/dvb-frontends/" + install -d "$pkgdir/usr/src/linux-$kernrel/drivers/media/tuners" + cp drivers/media/tuners/*.h "$pkgdir/usr/src/linux-$kernrel/drivers/media/tuners/" + + # add xfs and shmem for aufs building + install -d "$pkgdir/usr/src/linux-$kernrel/fs/xfs" + install -d "$pkgdir/usr/src/linux-$kernrel/mm" + cp fs/xfs/xfs_sb.h "$pkgdir/usr/src/linux-$kernrel/fs/xfs/xfs_sb.h" + + # copy in Kconfig files + for i in $(find . -name "Kconfig*"); do + install -d "$pkgdir/usr/src/linux-$kernrel"/$(echo $i | sed 's|/Kconfig.*||') + cp "$i" "$pkgdir/usr/src/linux-$kernrel/$i" + done + + # strip scripts directory + find "$pkgdir/usr/src/linux-$kernrel/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "$binary")" in + *application/x-sharedlib*) # Libraries (.so) + $_nice strip $STRIP_SHARED "$binary";; + *application/x-archive*) # Libraries (.a) + $_nice strip $STRIP_STATIC "$binary";; + *application/x-executable*) # Binaries + $_nice strip $STRIP_BINARIES "$binary";; + esac + done + +} + # vim:set ts=2 sw=2 ft=sh et: -- GitLab