summaryrefslogtreecommitdiff
path: root/libre/linux-libre-lts
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-07-17 05:19:48 -0300
committerMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-07-17 05:19:48 -0300
commit0a32dd5aab83123487e6988ec37e7e5385c3aef6 (patch)
tree760f093c15bf512361439acc7b998f04fdd0cb5b /libre/linux-libre-lts
parent7d3151cb257dcb2aeacf52bad5d96041677754a2 (diff)
parent201a3a8a986287b2f54d01e7c5e4bbeba8c37040 (diff)
downloadabslibre-0a32dd5aab83123487e6988ec37e7e5385c3aef6.tar.gz
abslibre-0a32dd5aab83123487e6988ec37e7e5385c3aef6.tar.bz2
abslibre-0a32dd5aab83123487e6988ec37e7e5385c3aef6.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/linux-libre-lts')
-rw-r--r--libre/linux-libre-lts/PKGBUILD30
-rw-r--r--libre/linux-libre-lts/config.i68621
-rw-r--r--libre/linux-libre-lts/config.x86_6421
3 files changed, 27 insertions, 45 deletions
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index b8127136b..37100b2e5 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189672 2013-07-04 11:25:41Z tpowa $
+# $Id: PKGBUILD 190072 2013-07-14 10:57:39Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,10 +8,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=85
+_sublevel=86
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.84 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.85 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,9 +33,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
md5sums=('f30a562307b6f71204370fcd33756466'
- '19d15be63712a9d1508a72062dc3da7e'
- '6ab0f1a509481d93117b7630105757cc'
- '18dfa330a7da88d7c09c3e24a5cd608f'
+ '944af5c4562296147f667d3828b18fa4'
+ '7373cc3ac66342156a7fc32af8577b46'
+ 'b7229f80282337979514f9640a969ff5'
'c072b17032e80debc6a8626299245d46'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
@@ -45,9 +45,9 @@ md5sums=('f30a562307b6f71204370fcd33756466'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- '4cd1209f2b4eab4f26f82e7208c53d28')
+ 'f977e46a6d3788dcba906526d006a2f2')
if [ "$CARCH" != "mips64el" ]; then
- # Don't use the Loongson-specific patches on non-mips64el arches.
+ # don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
unset md5sums[${#md5sums[@]}-1]
fi
@@ -62,7 +62,7 @@ prepare() {
patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1"
fi
- # Add freedo as boot logo
+ # add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
# Some chips detect a ghost TV output
@@ -96,10 +96,10 @@ prepare() {
patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
patch -Np0 -i lxo-config.patch
-# ensure N32, add localversion, remove uevent helper as per
-# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-# and make USB storage support builtin (e.g. for booting from USB
-# disks without slowly loading an initramfs)
+ # ensure N32, add localversion, remove uevent helper as per
+ # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
+ # and make USB storage support builtin (e.g. for booting from USB
+ # disks without slowly loading an initramfs)
sed -ri \
-e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
-e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
@@ -224,7 +224,7 @@ _package() {
-e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
-i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-# mkinitcpio 0.7 relies on bzImage to find the kernel version
+ # mkinitcpio 0.7 relies on bzImage to find the kernel version
if [ "$CARCH" == "mips64el" ]; then
sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
-i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
@@ -258,7 +258,7 @@ _package-headers() {
KARCH=x86
[ $CARCH = "mips64el" ] && KARCH=mips
-# In case of repackaging this is empty
+ # in case of repackaging this is empty
if [ -z "${_kernver}" ]; then
cd "${srcdir}/linux-${_basekernel}"
_kernver="$(make LOCALVERSION= kernelrelease)"
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index a1d065a1a..47ddf3921 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -379,8 +379,8 @@ CONFIG_TOSHIBA=m
CONFIG_I8K=m
CONFIG_X86_REBOOTFIXUPS=y
CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# CONFIG_MICROCODE_INTEL is not set
+# CONFIG_MICROCODE_AMD is not set
CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
@@ -2117,17 +2117,8 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
CONFIG_IWLAGN=m
#
@@ -3737,7 +3728,7 @@ CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m
-CONFIG_STUB_POULSBO=m
+# CONFIG_STUB_POULSBO is not set
CONFIG_VGASTATE=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
CONFIG_FB=y
@@ -3797,7 +3788,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index a5dc36205..092d3f4fa 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -357,8 +357,8 @@ CONFIG_X86_MCE_THRESHOLD=y
CONFIG_X86_THERMAL_VECTOR=y
CONFIG_I8K=m
CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# CONFIG_MICROCODE_INTEL is not set
+# CONFIG_MICROCODE_AMD is not set
CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
@@ -2004,17 +2004,8 @@ CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_PLX=m
CONFIG_HOSTAP_PCI=m
CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
CONFIG_IWLAGN=m
#
@@ -3570,7 +3561,7 @@ CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
CONFIG_DRM_SAVAGE=m
-CONFIG_STUB_POULSBO=m
+# CONFIG_STUB_POULSBO is not set
CONFIG_VGASTATE=m
CONFIG_VIDEO_OUTPUT_CONTROL=m
CONFIG_FB=y
@@ -3627,7 +3618,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set