From bce247d29e4c6f3b30326d485942cc2d3614430f Mon Sep 17 00:00:00 2001 From: root Date: Mon, 16 Sep 2013 01:45:50 -0700 Subject: Mon Sep 16 01:44:21 PDT 2013 --- libre-testing/linux-libre/PKGBUILD | 17 ++++++++--------- libre-testing/linux-libre/config.i686 | 8 ++++---- libre-testing/linux-libre/config.x86_64 | 8 ++++---- 3 files changed, 16 insertions(+), 17 deletions(-) (limited to 'libre-testing') diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD index bc4e821dd..70d9f739b 100644 --- a/libre-testing/linux-libre/PKGBUILD +++ b/libre-testing/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193873 2013-09-03 07:49:19Z tpowa $ +# $Id: PKGBUILD 194378 2013-09-15 09:16:34Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -10,9 +10,8 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.11 -#_sublevel=10 -#pkgver=${_basekernel}.${_sublevel} -pkgver=${_basekernel} +_sublevel=1 +pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.0 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +20,7 @@ license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -33,16 +32,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('7ec84223c7adcf01a5287eb7af96b7e7' - #'673ae6d60b4ce8acad930a06f9fe2e3f' - 'b677535858e784fbfe924884941ea81c' - '0048b12cb4bbb449c25e83e38f99f5b8' + '7b051faf375c76d4763a24048c52600b' + 'b7718a81faf845ab53234336122ad631' + 'f7ee88ffc93b665345b6ee89ff192e1f' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '36e90334b12b2e9d53fd92129ee98f5b' '98beb36f9b8cf16e58de2483ea9985e3' 'd50c1ac47394e9aec637002ef3392bd1' - '57770a810cc7efb650a7ea15f8cba633') + '135ff203ec680a91e87eed4df72f453d') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre-testing/linux-libre/config.i686 b/libre-testing/linux-libre/config.i686 index 65bb11f0a..a19c09d75 100644 --- a/libre-testing/linux-libre/config.i686 +++ b/libre-testing/linux-libre/config.i686 @@ -5661,9 +5661,7 @@ CONFIG_ISCSI_IBFT=m # # EFI (Extensible Firmware Interface) Support # -CONFIG_EFI_VARS=m -CONFIG_EFI_VARS_PSTORE=m -CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y +# CONFIG_EFI_VARS is not set # # File systems @@ -6186,10 +6184,12 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init" CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_YAMA is not set +CONFIG_SECURITY_YAMA=y +CONFIG_SECURITY_YAMA_STACKED=y # CONFIG_IMA is not set # CONFIG_DEFAULT_SECURITY_TOMOYO is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set +# CONFIG_DEFAULT_SECURITY_YAMA is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" CONFIG_XOR_BLOCKS=m diff --git a/libre-testing/linux-libre/config.x86_64 b/libre-testing/linux-libre/config.x86_64 index 707d093aa..169a2285b 100644 --- a/libre-testing/linux-libre/config.x86_64 +++ b/libre-testing/linux-libre/config.x86_64 @@ -5452,9 +5452,7 @@ CONFIG_ISCSI_IBFT=m # # EFI (Extensible Firmware Interface) Support # -CONFIG_EFI_VARS=m -CONFIG_EFI_VARS_PSTORE=m -CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y +# CONFIG_EFI_VARS is not set # # File systems @@ -5979,10 +5977,12 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init" CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 -# CONFIG_SECURITY_YAMA is not set +CONFIG_SECURITY_YAMA=y +CONFIG_SECURITY_YAMA_STACKED=y # CONFIG_IMA is not set # CONFIG_DEFAULT_SECURITY_TOMOYO is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set +# CONFIG_DEFAULT_SECURITY_YAMA is not set CONFIG_DEFAULT_SECURITY_DAC=y CONFIG_DEFAULT_SECURITY="" CONFIG_XOR_BLOCKS=m -- cgit v1.2.3-54-g00ecf