summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorSorin-Mihai Vârgolici <smv@yobicore.org>2011-08-02 00:17:13 +0300
committerSorin-Mihai Vârgolici <smv@yobicore.org>2011-08-02 00:17:13 +0300
commit65bbaf3b9aad5509c836f792cd6ea6ef4d23a274 (patch)
tree8b52b075f925f6f8cf4d3abbdef4c0a2ac6ed17a /libre
parent5fc62ce166af0ff2f4113d75e098852eae56d91b (diff)
A few changes to linux-libre
Diffstat (limited to 'libre')
-rw-r--r--libre/linux-libre/PKGBUILD25
1 files changed, 12 insertions, 13 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 94b1c7a93..b76294ad4 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
_kernelname=${pkgname#linux-libre}
_basekernel=3.0
pkgver=${_basekernel}
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url="http://linux-libre.fsfla.org"
license=('GPL2')
@@ -33,33 +33,32 @@ md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
'7396b811db06dec0250a1a098f527b83')
build() {
- cd "${srcdir}/linux-$pkgver"
-
- # fix #19234 i1915 display size
- patch -Np1 -i "${srcdir}/fix-i915.patch"
+ cd "${srcdir}/linux-${_basekernel}"
# Add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
+ # fix #19234 i1915 display size
+ patch -Np1 -i "${srcdir}/fix-i915.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)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
- cat $srcdir/config.$CARCH > ./.config # simpler
+ cat "$srcdir/config.$CARCH" > ./.config # simpler
if [ "${_kernelname}" != "" ]; then
sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
fi
# remove the "-libre" extraversion from Makefile
- # this ensures our kernel version is always 3.X-LIBRE
- # this way, minor kernel updates will not break external modules
- # we need to change this soon, see FS#16702
sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|g' Makefile
# remove the sublevel from Makefile
- # this ensures our kernel version is always 3.X-ARCH
+ # this ensures our kernel version is always 3.X-LIBRE
+ # this way, minor kernel updates will not break external modules
+ # we need to change this soon, see FS#16702
sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile
# get kernel version
@@ -97,7 +96,7 @@ package_linux-libre() {
backup=("etc/mkinitcpio.d/${pkgname}.preset")
install=${pkgname}.install
- cd "${srcdir}/linux-${pkgver}"
+ cd "${srcdir}/linux-${_basekernel}"
KARCH=x86
@@ -145,7 +144,7 @@ package_linux-libre-headers() {
cd "${pkgdir}/lib/modules/${_kernver}"
ln -sf ../../../usr/src/linux-${_kernver} build
- cd "${srcdir}/linux-$pkgver"
+ cd "${srcdir}/linux-${_basekernel}"
install -D -m644 Makefile \
"${pkgdir}/usr/src/linux-${_kernver}/Makefile"
install -D -m644 kernel/Makefile \
@@ -271,7 +270,7 @@ package_linux-libre-docs() {
conflicts=('kernel26-docs' 'linux-docs')
replaces=('kernel26-docs' 'linux-docs')
- cd "${srcdir}/linux-$pkgver"
+ cd "${srcdir}/linux-${_basekernel}"
mkdir -p "$pkgdir/usr/src/linux-$_kernver"
cp -r Documentation "$pkgdir/usr/src/linux-$_kernver"