summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-08-01 16:20:57 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-08-01 16:20:57 -0300
commit039c5aca33617cb293c1a2a83e1d0d1caad8fbb5 (patch)
treeba0e25a6119fecd15939eccbfb1301c893f3f197
parent2174e5e2b9fbeb64ce3638ede597b8206c5b74f2 (diff)
parentb365d77d43aaf0eac93f5dab001c6b61e3d0634f (diff)
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre
Conflicts: libre/linux-libre/PKGBUILD
-rw-r--r--libre/linux-libre/PKGBUILD14
-rw-r--r--libre/linux-libre/linux-libre.install8
-rw-r--r--libre/linux-libre/linux-libre.preset4
3 files changed, 14 insertions, 12 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 312f129e9..94b1c7a93 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,8 +1,10 @@
# $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-pkgbase="linux-libre"
+# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
+
+pkgbase=linux-libre
pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel
# pkgname=linux-custom # Build kernel with a different name
_kernelname=${pkgname#linux-libre}
@@ -14,7 +16,7 @@ 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
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/linux-${pkgver}-libre.tar.xz"
# the main kernel config files
'config.i686' 'config.x86_64'
# standard config files for mkinitcpio ramdisk
@@ -31,13 +33,13 @@ md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
'7396b811db06dec0250a1a098f527b83')
build() {
- cd ${srcdir}/linux-$pkgver
+ cd "${srcdir}/linux-$pkgver"
# fix #19234 i1915 display size
- patch -Np1 -i ${srcdir}/fix-i915.patch
+ patch -Np1 -i "${srcdir}/fix-i915.patch"
# Add freedo as boot logo
- patch -Np1 -i ${srcdir}/boot-logo.patch
+ patch -Np1 -i "${srcdir}/boot-logo.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
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 59674365a..51e78dc60 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -12,9 +12,9 @@ post_install () {
mkinitcpio -p linux-libre${KERNEL_NAME}
# add compat symlinks for the initramfs images
- ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26-libre${KERNEL_NAME}.img
+ ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
- boot/kernel26-libre${KERNEL_NAME}-fallback.img
+ boot/kernel26${KERNEL_NAME}-fallback.img
}
post_upgrade() {
@@ -53,6 +53,6 @@ post_upgrade() {
post_remove() {
# also remove the compat symlinks
- rm -f boot/{initramfs-linux,kernel26}-libre${KERNEL_NAME}.img
- rm -f boot/{initramfs-linux,kernel26}-libre${KERNEL_NAME}-fallback.img
+ rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
+ rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
}
diff --git a/libre/linux-libre/linux-libre.preset b/libre/linux-libre/linux-libre.preset
index eeed678dc..7af90ba7a 100644
--- a/libre/linux-libre/linux-libre.preset
+++ b/libre/linux-libre/linux-libre.preset
@@ -6,9 +6,9 @@ ALL_kver="/boot/vmlinuz-linux-libre"
PRESETS=('default' 'fallback')
#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux.img"
+default_image="/boot/initramfs-linux-libre.img"
#default_options=""
#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-fallback.img"
+fallback_image="/boot/initramfs-linux-libre-fallback.img"
fallback_options="-S autodetect"