From b7597b63128e9d227c4330c446cb04a70e21ff2a Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 11 May 2017 06:39:12 +0000 Subject: main/linux-hardened: move CONFIG_NR_CPUS to 256, as in linux-vanilla on x86_64 --- community/virtualbox-guest-modules-hardened/APKBUILD | 2 +- main/dahdi-linux-hardened/APKBUILD | 2 +- main/devicemaster-linux-hardened/APKBUILD | 2 +- main/drbd9-hardened/APKBUILD | 2 +- main/linux-hardened/APKBUILD | 4 ++-- main/linux-hardened/config-hardened.x86_64 | 2 +- main/spl-hardened/APKBUILD | 2 +- main/xtables-addons-hardened/APKBUILD | 2 +- main/zfs-hardened/APKBUILD | 2 +- testing/ipt-netflow-hardened/APKBUILD | 2 +- testing/sch-cake-hardened/APKBUILD | 2 +- testing/virtualbox-additions-hardened/APKBUILD | 2 +- testing/wireguard-hardened/APKBUILD | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/community/virtualbox-guest-modules-hardened/APKBUILD b/community/virtualbox-guest-modules-hardened/APKBUILD index 25add6b9e6..702ff312e0 100644 --- a/community/virtualbox-guest-modules-hardened/APKBUILD +++ b/community/virtualbox-guest-modules-hardened/APKBUILD @@ -4,7 +4,7 @@ _flavor=${FLAVOR:-hardened} _kpkg=linux-$_flavor _kver=4.9.27 -_kpkgrel=0 +_kpkgrel=1 # when chaning _ver we *must* bump _mypkgrel _ver=5.1.14 diff --git a/main/dahdi-linux-hardened/APKBUILD b/main/dahdi-linux-hardened/APKBUILD index eef4d8de3a..768a04d5d3 100644 --- a/main/dahdi-linux-hardened/APKBUILD +++ b/main/dahdi-linux-hardened/APKBUILD @@ -4,7 +4,7 @@ _flavor=hardened _kpkg=linux-$_flavor _kver=4.9.27 -_kpkgrel=0 +_kpkgrel=1 _mypkgrel=0 _kpkgver="$_kver-r$_kpkgrel" diff --git a/main/devicemaster-linux-hardened/APKBUILD b/main/devicemaster-linux-hardened/APKBUILD index 7a831c607e..66c2e242dd 100644 --- a/main/devicemaster-linux-hardened/APKBUILD +++ b/main/devicemaster-linux-hardened/APKBUILD @@ -3,7 +3,7 @@ _flavor=hardened _kpkg=linux-$_flavor _kver=4.9.27 -_kpkgrel=0 +_kpkgrel=1 _mypkgrel=0 _kpkgver="$_kver-r$_kpkgrel" diff --git a/main/drbd9-hardened/APKBUILD b/main/drbd9-hardened/APKBUILD index c9caf585f2..53d3605eb7 100644 --- a/main/drbd9-hardened/APKBUILD +++ b/main/drbd9-hardened/APKBUILD @@ -6,7 +6,7 @@ _name=$_usname-$_flavor _kpkg=linux-$_flavor _kver=4.9.27 -_kpkgrel=0 +_kpkgrel=1 _usver=9.0.7 # upstream now also has a -rel in the tar-balls diff --git a/main/linux-hardened/APKBUILD b/main/linux-hardened/APKBUILD index e99ade7423..5bbbc30df2 100644 --- a/main/linux-hardened/APKBUILD +++ b/main/linux-hardened/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; esac -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with hardening patches" url="http://alpinelinux.org" depends="mkinitfs" @@ -207,7 +207,7 @@ e7a9302d284e77c4a961f6cbfe5c702bbb2db5046a35e4c850d0549808ac8278d550239d7af72f2d 9ed31a793211f3042a7dd51759a1c357c02240b004bd55d22c4657d7898710c14dd6d33de3d404e5e24b2319bec7cd6284ce33534dd902c5dc36fc00f58d8ca1 hardened-3.1-4.9.27-201704252333-alpine.patch 5a0a78e6de11eb8180d96830b9faa9ac560586f7beb663c8196a16ac6232b5008b9181b3c9b94e2b13a444acba4b6e80a3408d34606432f92eb4d169c3953d5d zfs-fix.patch e0f8793210d3974a748bd7b1cd71cf7adc3672d279a1d51bbf1a7417161fadaf377bff43fa51b943c89051c62cf608af263137e5c5f904cf70391b94d60cb14d config-hardened.x86 -adab5e5165c139e219a49b5aa386e64a8778548fe41d34d62a4ca1fceae36a3001d570695a425b9e10f96a14fa67288ffde3d012165e23aeccc087fd6a79989f config-hardened.x86_64 +b81a9578c165f3f091d5bbdfd34bd45d94416f90e236bd73595337da30ddc7f02bede9ff7265d0a7fb68c1a3237ecb0a2bb67a9279ab09a6cde959f54848365d config-hardened.x86_64 0b14dc2d522daa10d102a10d79af242ac80631131f2748188d66964e94a95f0437458f280d9bdb302548b25c4bd1c2aecdbb619be9ba599ffd9b56fa16d6a277 config-hardened.armhf 1de874523eee031c2efadfb6f7ddb86bb303b9f61d1a022e4e922f6365c3a667c2a1fdb61570a95a05c6c45689796e355eae9579e567790b757ae2a09f6be8c4 config-virthardened.x86 0570f4ad5af0d6e3cbf50d9e3a7d6dab8d7cba85693037e70dbee73aa1e4fc66cb217e1ef8e4a0ceb4073ffb6ada8201775bafe8401dc6dff5c07ac3bbe0f8f0 config-virthardened.x86_64" diff --git a/main/linux-hardened/config-hardened.x86_64 b/main/linux-hardened/config-hardened.x86_64 index c8cf5f64a3..9983261233 100644 --- a/main/linux-hardened/config-hardened.x86_64 +++ b/main/linux-hardened/config-hardened.x86_64 @@ -444,7 +444,7 @@ CONFIG_GART_IOMMU=y CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y # CONFIG_MAXSMP is not set -CONFIG_NR_CPUS=32 +CONFIG_NR_CPUS=256 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set diff --git a/main/spl-hardened/APKBUILD b/main/spl-hardened/APKBUILD index 9f7f0583f9..5cccf91918 100644 --- a/main/spl-hardened/APKBUILD +++ b/main/spl-hardened/APKBUILD @@ -6,7 +6,7 @@ _name=$_realname-$_flavor _kpkg=linux-$_flavor _kver=4.9.27 -_kpkgrel=0 +_kpkgrel=1 _realver=0.6.5.9 _mypkgrel=0 diff --git a/main/xtables-addons-hardened/APKBUILD b/main/xtables-addons-hardened/APKBUILD index 199cb01ebf..109144731d 100644 --- a/main/xtables-addons-hardened/APKBUILD +++ b/main/xtables-addons-hardened/APKBUILD @@ -5,7 +5,7 @@ _realname=xtables-addons _name=$_realname-$_flavor _kver=4.9.27 -_kpkgrel=0 +_kpkgrel=1 _realver=2.12 _mypkgrel=0 diff --git a/main/zfs-hardened/APKBUILD b/main/zfs-hardened/APKBUILD index efcf9407af..36a6387f3a 100644 --- a/main/zfs-hardened/APKBUILD +++ b/main/zfs-hardened/APKBUILD @@ -7,7 +7,7 @@ _name=$_realname-$_flavor _kpkg=linux-$_flavor _kver=4.9.27 -_kpkgrel=0 +_kpkgrel=1 _realver=0.6.5.9 _mypkgrel=0 diff --git a/testing/ipt-netflow-hardened/APKBUILD b/testing/ipt-netflow-hardened/APKBUILD index 2fd9974c94..99aab29648 100644 --- a/testing/ipt-netflow-hardened/APKBUILD +++ b/testing/ipt-netflow-hardened/APKBUILD @@ -3,7 +3,7 @@ _flavor=hardened _kpkg=linux-$_flavor _kver=4.9.27 -_kpkgrel=0 +_kpkgrel=1 # when chaning _ver we *must* bump _mypkgrel _ver=2.2 diff --git a/testing/sch-cake-hardened/APKBUILD b/testing/sch-cake-hardened/APKBUILD index bc82351f51..77f6f88e1d 100644 --- a/testing/sch-cake-hardened/APKBUILD +++ b/testing/sch-cake-hardened/APKBUILD @@ -6,7 +6,7 @@ _realname=sch-cake _name=$_realname-$_flavor _kver=4.9.27 -_kpkgrel=0 +_kpkgrel=1 _gitver=9789742cfc596d48583ba4cdbc8f38d026121fa6 _mypkgrel=0 diff --git a/testing/virtualbox-additions-hardened/APKBUILD b/testing/virtualbox-additions-hardened/APKBUILD index da96ef2873..f44b2aa725 100644 --- a/testing/virtualbox-additions-hardened/APKBUILD +++ b/testing/virtualbox-additions-hardened/APKBUILD @@ -3,7 +3,7 @@ _flavor=hardened _kpkg=linux-$_flavor _kver=4.9.27 -_kpkgrel=0 +_kpkgrel=1 # when chaning _ver we *must* bump _mypkgrel _ver=5.1.14 diff --git a/testing/wireguard-hardened/APKBUILD b/testing/wireguard-hardened/APKBUILD index 0ae9a79ec0..426b65606f 100644 --- a/testing/wireguard-hardened/APKBUILD +++ b/testing/wireguard-hardened/APKBUILD @@ -4,7 +4,7 @@ _flavor=${FLAVOR:-hardened} _kpkg=linux-$_flavor _kver=4.9.27 -_kpkgrel=0 +_kpkgrel=1 # when changing _ver we *must* bump _mypkgrel _ver=0.0.20170421 -- cgit v1.2.3