libre/linux-libre-3.0-2

3 files changed, 10 insertions, 28 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 29e3b05a0..e219e6b91 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.0
 pkgver=${_basekernel}
-pkgrel=1
+pkgrel=2
 makedepends=('xmlto' 'docbook-xsl')
 arch=(i686 x86_64)
 license=('GPL2')
@@ -24,8 +24,8 @@ source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/li
 md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
          'd4805e76a2b0c883ed8269f3dad601fb'
          'fbefcac9fecd28e4d2e12dbee77f6602'
-         '434092c585bb93bf2e68620e2be186ac'
-         'cb8f7f43402713a07490bcfb3c978a1c'
+         '18341549f090fc403d7f4c47fff395a4'
+         '04b21c79df0a952c22d681dd4f4562df'
          'fe04ae7274a1f76ba2a8054aec60ef08')
 
 build() {
@@ -237,21 +237,3 @@ package_linux-libre-docs() {
   # remove a file already in linux package
   rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
 }
-md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         'd4805e76a2b0c883ed8269f3dad601fb'
-         'fbefcac9fecd28e4d2e12dbee77f6602'
-         '434092c585bb93bf2e68620e2be186ac'
-         'cb8f7f43402713a07490bcfb3c978a1c'
-         'fe04ae7274a1f76ba2a8054aec60ef08')
-md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         'd4805e76a2b0c883ed8269f3dad601fb'
-         'fbefcac9fecd28e4d2e12dbee77f6602'
-         '434092c585bb93bf2e68620e2be186ac'
-         '109f2bb7df81c855c1cf6d177e9d500f'
-         'fe04ae7274a1f76ba2a8054aec60ef08')
-md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         'd4805e76a2b0c883ed8269f3dad601fb'
-         'fbefcac9fecd28e4d2e12dbee77f6602'
-         '434092c585bb93bf2e68620e2be186ac'
-         '04b21c79df0a952c22d681dd4f4562df'
-         'fe04ae7274a1f76ba2a8054aec60ef08')
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 6998eac91..a45c09b70 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -9,12 +9,12 @@ post_install () {
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
   echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux${KERNEL_NAME}
+  mkinitcpio -p linux-libre${KERNEL_NAME}
 
   # add compat symlinks for the initramfs images
-  ln -sf initramfs-linux${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-  ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \
-    boot/kernel26${KERNEL_NAME}-fallback.img
+  ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26-libre${KERNEL_NAME}.img
+  ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
+    boot/kernel26-libre${KERNEL_NAME}-fallback.img
 }
 
 post_upgrade() {
@@ -53,7 +53,7 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux,kernel26}${KERNEL_NAME}-fallback.img
+  rm -f boot/{initramfs-linux,kernel26}-libre${KERNEL_NAME}.img
+  rm -f boot/{initramfs-linux,kernel26}-libre${KERNEL_NAME}-fallback.img
 }
 
diff --git a/libre/linux-libre/linux-libre.preset b/libre/linux-libre/linux-libre.preset
index 6f14059f1..e000cf584 100644
--- a/libre/linux-libre/linux-libre.preset
+++ b/libre/linux-libre/linux-libre.preset
@@ -1,7 +1,7 @@
 # mkinitcpio preset file for the 'linux' package
 
 ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux"
+ALL_kver="/boot/vmlinuz-linux-libre"
 
 PRESETS=('default' 'fallback')