diff options
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 26 | ||||
| -rw-r--r-- | libre/linux-libre/config.i686 | 3 | ||||
| -rw-r--r-- | libre/linux-libre/config.x86_64 | 10 | ||||
| -rw-r--r-- | libre/linux-libre/linux-libre.install | 2 | ||||
| -rw-r--r-- | libre/linux-libre/linux-libre.preset | 2 |
5 files changed, 16 insertions, 27 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 47dfecba8..2022e0e50 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,9 +12,9 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE _basekernel=3.3 -_sublevel=3 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -32,24 +32,20 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'fix-memblock-3.3.x.patch' - 'fix-r8712u-3.3.2.patch' 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5487da14ca81715a469c7594d39722fa' - 'b3584346eba0031be9e08c0c6d64fa85' - '8c97845fa581b5d8172694d85577d817' - '60c740318d677350ac5251300f6cbe73' - 'a8a3843046926eb7ab81312cd438c5c5' + 'ce7d959667b9f158b1fb814b5806950a' + '225fc118e655b0e4031aaf45656b872c' + 'e6b45d3ba0415d2dfbda9cdbf6dbf6f4' + 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - 'bfbac6688a9031372638438adccd4595' - '4be6f77e4c1533c4587dd48cfd50759e' 'bb7fd1aa23016c8057046b84fd4eb528' - '107729418380124db470dda99425fdce') + 'c22b03a6351698b07cd08767d8ddeacd') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -76,14 +72,6 @@ build() { patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" # Patch submitted upstream, waiting for inclusion: - # fix https://bugzilla.kernel.org/show_bug.cgi?id=43098 - # Arch Linux bug report #29351 - patch -Np1 -i "${srcdir}/fix-memblock-3.3.x.patch" - - # Patch submitted upstream, waiting for inclusion: - # Arch Linux bug report #29339 - # probably 3.3.4 will include it - patch -Np1 -i "${srcdir}/fix-r8712u-3.3.2.patch" # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index c58fe0e40..dd67c6ce4 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -795,7 +795,8 @@ CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_PROCFS=y +# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CT_PROTO_DCCP=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 279c94035..22ac05afb 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.3.0-1 Kernel Configuration +# Linux/x86_64 3.3.4-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -757,7 +757,7 @@ CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_ZONES=y -# CONFIG_NF_CONNTRACK_PROCFS is not set +CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CT_PROTO_DCCP=m @@ -914,6 +914,7 @@ CONFIG_IP_VS_PE_SIP=m # CONFIG_NF_DEFRAG_IPV4=m CONFIG_NF_CONNTRACK_IPV4=m +# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m @@ -1127,8 +1128,6 @@ CONFIG_BPF_JIT=y CONFIG_NET_PKTGEN=m CONFIG_NET_DROP_MONITOR=y CONFIG_HAMRADIO=y -# CONFIG_CAN is not set -CONFIG_IRDA=m # # Packet Radio protocols @@ -1148,6 +1147,8 @@ CONFIG_BAYCOM_SER_FDX=m CONFIG_BAYCOM_SER_HDX=m CONFIG_BAYCOM_PAR=m CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m # # IrDA protocols @@ -4709,7 +4710,6 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m CONFIG_R8712U=m -CONFIG_R8712_AP=y CONFIG_RTS_PSTOR=m # CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index dd133c2b1..a0a1dae88 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.3.3-1-LIBRE +KERNEL_VERSION=3.3.4-1-LIBRE post_install () { # updating module dependencies diff --git a/libre/linux-libre/linux-libre.preset b/libre/linux-libre/linux-libre.preset index 7af90ba7a..0ac59eb14 100644 --- a/libre/linux-libre/linux-libre.preset +++ b/libre/linux-libre/linux-libre.preset @@ -1,4 +1,4 @@ -# mkinitcpio preset file for the 'linux' package +# mkinitcpio preset file for the 'linux-libre' package ALL_config="/etc/mkinitcpio.conf" ALL_kver="/boot/vmlinuz-linux-libre" |