summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-08-06 19:04:09 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-08-06 19:04:09 -0300
commit716b086f2ce4a4c37fa1111df55bc5c40c29c8b7 (patch)
treed1fd758973d2f520a08513cc9af83c348e464e9d /libre
parent2f151ac8a29a733398b5294f1574cc00e454885e (diff)
downloadabslibre-716b086f2ce4a4c37fa1111df55bc5c40c29c8b7.tar.gz
abslibre-716b086f2ce4a4c37fa1111df55bc5c40c29c8b7.tar.bz2
abslibre-716b086f2ce4a4c37fa1111df55bc5c40c29c8b7.zip
libre/linux-libre-3.0.1-2
Diffstat (limited to 'libre')
-rw-r--r--libre/linux-libre/PKGBUILD36
-rw-r--r--libre/linux-libre/change-default-console-loglevel.patch1
-rw-r--r--libre/linux-libre/linux-libre.install16
3 files changed, 30 insertions, 23 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 3e6639ba5..5d3c27638 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,14 +10,14 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
_kernelname=${pkgname#linux-libre}
_basekernel=3.0
pkgver=${_basekernel}.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl')
options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/linux-${pkgver}-libre.tar.xz"
- #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
+ "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
# the main kernel config files
'config.i686' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
@@ -25,18 +25,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/l
'boot-logo.patch'
'fix-i915.patch'
'change-default-console-loglevel.patch')
-md5sums=('edf5ba3f0b0ec5e0c0c8e29ea044ac93'
- '66dff8af6b00eb8d054b2af85aaa5ef7'
- '1a98b8b8f2140ac8f95c3814cba8cc95'
- 'a8a3843046926eb7ab81312cd438c5c5'
- '04b21c79df0a952c22d681dd4f4562df'
- '263725f20c0b9eb9c353040792d644e5'
- '7396b811db06dec0250a1a098f527b83')
build() {
- cd "${srcdir}/linux-${pkgver}"
+ cd "${srcdir}/linux-${_basekernel}"
- #patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+ patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
# Add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
@@ -99,7 +92,7 @@ package_linux-libre() {
backup=("etc/mkinitcpio.d/${pkgname}.preset")
install=${pkgname}.install
- cd "${srcdir}/linux-${pkgver}"
+ cd "${srcdir}/linux-${_basekernel}"
KARCH=x86
@@ -128,8 +121,6 @@ package_linux-libre() {
# remove build and source links
rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
- # add compat symlink for the kernel image
- ln -sf vmlinuz-${pkgname} "${pkgdir}/boot/vmlinuz26${_kernelname}"
# remove the firmware
rm -rf "${pkgdir}/lib/firmware"
# gzip -9 all modules to safe 100MB of space
@@ -147,7 +138,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 \
@@ -273,9 +264,9 @@ 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"
+ mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
cp -r Documentation "$pkgdir/usr/src/linux-$_kernver"
find "${pkgdir}" -type f -exec chmod 444 {} \;
find "${pkgdir}" -type d -exec chmod 755 {} \;
@@ -285,3 +276,12 @@ package_linux-libre-docs() {
}
# vim:set ts=2 sw=2 et:
+
+md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
+ 'af8d721036d89ed5500675c3289e3b48'
+ '66dff8af6b00eb8d054b2af85aaa5ef7'
+ '1a98b8b8f2140ac8f95c3814cba8cc95'
+ 'a8a3843046926eb7ab81312cd438c5c5'
+ '04b21c79df0a952c22d681dd4f4562df'
+ '263725f20c0b9eb9c353040792d644e5'
+ '9d3c56a4b999c8bfbd4018089a62f662')
diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch
index cec208ee8..63435d84f 100644
--- a/libre/linux-libre/change-default-console-loglevel.patch
+++ b/libre/linux-libre/change-default-console-loglevel.patch
@@ -10,4 +10,3 @@ diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
DECLARE_WAIT_QUEUE_HEAD(log_wait);
-
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 64ea2d1bf..1de64b640 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -11,10 +11,18 @@ post_install () {
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
mkinitcpio -p linux-libre${KERNEL_NAME}
- # add compat symlinks for the initramfs images
- ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
- ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
- boot/kernel26${KERNEL_NAME}-fallback.img
+ # compat symlinks for the official kernels only
+ if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
+ loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
+ [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
+ if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
+ # add compat symlinks for the initramfs images
+ ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
+ ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
+ boot/kernel26${KERNEL_NAME}-fallback.img
+ ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
+ fi
+ fi
}
post_upgrade() {