diff options
| -rw-r--r-- | main/dahdi-linux-grsec/APKBUILD | 2 | ||||
| -rw-r--r-- | main/iscsitarget-grsec/APKBUILD | 2 | ||||
| -rw-r--r-- | main/kqemu-grsec/APKBUILD | 2 | ||||
| -rw-r--r-- | main/linux-grsec/APKBUILD | 19 | ||||
| -rw-r--r-- | main/xtables-addons-grsec/APKBUILD | 2 | ||||
| -rw-r--r-- | testing/compat-wireless-grsec/APKBUILD | 4 |
6 files changed, 19 insertions, 12 deletions
diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index 9205ca3495..2829fccb82 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -14,7 +14,7 @@ _realname=dahdi-linux pkgname=${_realname}-${_flavor} pkgver=2.2.0 -pkgrel=17 +pkgrel=18 pkgdesc="Digium Asterisk Hardware Device Interface drivers" url="http://www.asterisk.org" license="GPL" diff --git a/main/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD index 07e6d8f1f2..753c4a7b1f 100644 --- a/main/iscsitarget-grsec/APKBUILD +++ b/main/iscsitarget-grsec/APKBUILD @@ -15,7 +15,7 @@ if [ -f ../iscsitarget/APKBUILD ]; then fi pkgname=${_realname}-${_flavor} pkgver=${pkgver:-0.4.17} -pkgrel=15 +pkgrel=16 pkgdesc="$_flavor kernel modules for iscsitarget" url="http://iscsitarget.sourceforge.net/" license="GPL-2" diff --git a/main/kqemu-grsec/APKBUILD b/main/kqemu-grsec/APKBUILD index c8a5606834..9813e26e0f 100644 --- a/main/kqemu-grsec/APKBUILD +++ b/main/kqemu-grsec/APKBUILD @@ -12,7 +12,7 @@ _abi_release=$pkgver-${_flavor} pkgname=${_realname}-${_flavor} pkgver=1.4.0_pre1 _realver=1.4.0pre1 -pkgrel=8 +pkgrel=9 pkgdesc="$_flavor kernel modules for kemu" url="http://www.nongnu.org/qemu/" license="GPL" diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index c06a6437ed..17752124c3 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -4,20 +4,20 @@ _flavor=grsec pkgname=linux-${_flavor} pkgver=2.6.30.7 _kernver=2.6.30 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net -depends="mkinitfs" +depends="mkinitfs linux-firmware" makedepends="perl installkernel" _config=${config:-kernelconfig} -install="$pkgname.post-install $pkgname.post-upgrade" +install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 grsecurity-2.1.14-2.6.30.7-200909151852.patch net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch $_config " -subpackages="$pkgname-dev" +subpackages="$pkgname-dev linux-firmware:firmware" license="GPL-2" _abi_release=${pkgver}-${_flavor} @@ -58,12 +58,12 @@ build() { INSTALL_MOD_PATH="$pkgdir" \ INSTALL_PATH="$pkgdir"/boot - ln -s vmlinuz-${_abi_release} "${pkgdir}"/boot/$_flavor +# ln -s vmlinuz-${_abi_release} "${pkgdir}"/boot/$_flavor rm -f "$pkgdir"/lib/modules/${_abi_release}/build \ "$pkgdir"/lib/modules/${_abi_release}/source install -D include/config/kernel.release \ - "$pkgdir"/usr/share/$pkgname/kernel.release + "$pkgdir"/usr/share/kernel/$_flavor/kernel.release } dev() { @@ -112,6 +112,13 @@ dev() { "$subpkgdir"/lib/modules/${_abi_release}/build } +firmware() { + pkgdesc="Firmware for linux kernel" + replaces="linux-grsec linux-vserver" + mkdir -p "$subpkgdir"/lib + mv "$pkgdir"/lib/firmware "$subpkgdir"/lib/ +} + md5sums="7a80058a6382e5108cdb5554d1609615 linux-2.6.30.tar.bz2 7c91fa862b90d74da3aa83446d69a412 patch-2.6.30.7.bz2 414fc3d63417fc21a00ef94a611c58be grsecurity-2.1.14-2.6.30.7-200909151852.patch diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD index 1dced8e6c2..6ec798f2d9 100644 --- a/main/xtables-addons-grsec/APKBUILD +++ b/main/xtables-addons-grsec/APKBUILD @@ -16,7 +16,7 @@ fi pkgname=${_realname}-${_flavor} pkgver=${pkgver:-1.17} -pkgrel=13 +pkgrel=14 pkgdesc="Iptables extensions kernel modules" url="http://xtables-addons.sourceforge.net/" license="GPL" diff --git a/testing/compat-wireless-grsec/APKBUILD b/testing/compat-wireless-grsec/APKBUILD index 5a628a915d..e474a4d31c 100644 --- a/testing/compat-wireless-grsec/APKBUILD +++ b/testing/compat-wireless-grsec/APKBUILD @@ -10,7 +10,7 @@ _kernelver=$pkgver-r$pkgrel pkgname=${_realname}-${_flavor} pkgver=2.6.30 -pkgrel=2 +pkgrel=3 pkgdesc="$_flavor kernel backported wifi drivers" url="http://linuxwireless.org/en/users/Download/stable/" license="GPL-2" @@ -23,7 +23,7 @@ source="http://www.orbit-lab.org/kernel/compat-wireless-2.6-stable/v$pkgver/comp " build() { - local _abi_release=$(cat /usr/share/linux-$_flavor/kernel.release) + local _abi_release=$(cat /usr/share/kernel/$_flavor/kernel.release) cd "$srcdir"/$_realname-$pkgver patch -p1 -i ../makefile.patch || return 1 unset ARCH |