Commits

Christos Nouskas committed ee0717c

Frigging stupid oversights

Comments (0)

Files changed (2)

 _minor=5
 #_patchlevel=0
 #_subversion=1
-_basekernel=$_major.$_minor
+_basekernel=${_major}.${_minor}
 _pkgname=linux-pf
 _pfrel=3
 _kernelname=-pf
 pkgname=('linux-pf')
 true && pkgname=('linux-pf' 'linux-pf-headers')
 pkgver=${_basekernel}.${_pfrel}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://pf.natalenko.name/"
 license=('GPL2')
 
  ### package_linux-pf
 
- ### c/p from linux-ARCH
-
-  cd "${srcdir}/${_srcname}"
+  cd "${srcdir}/linux-${_basekernel}"
 
   KARCH=x86
 
-  # get kernel version
-  _kernver="$(make LOCALVERSION= kernelrelease)"
-  _basekernel=${_kernver%%-*}
-  _basekernel=${_basekernel%.*}
+  echo # get kernel version
+  _kernver="$(make kernelrelease)"
+
+  ### c/p from linux-ARCH
 
   mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
   make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
 
   # install fallback mkinitcpio.conf file and preset file for kernel
-  install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  install -D -m644 "${srcdir}/linux-pf.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
 
   # set correct depmod command for install
   sed \
     -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
     -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
-    -i "${startdir}/linux.install"
+    -i "${startdir}/linux-pf.install"
   sed \
     -e "1s|'linux.*'|'${pkgbase}'|" \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
 
   provides=('linux-pf-headers')
   cd "${srcdir}/linux-${_basekernel}"
-
 # c/p from linux-ARCH
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
   cd "${pkgdir}/usr/lib/modules/${_kernver}"
   ln -sf ../../../src/linux-${_kernver} build
 
-  cd "${srcdir}/${_srcname}"
+  cd "${srcdir}/linux-${_basekernel}"
   install -D -m644 Makefile \
     "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
   install -D -m644 kernel/Makefile \
     cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
   done
 
+  make INSTALL_HDR_PATH="${pkgdir}/usr/src/linux-${_kernver}" headers_install
+
   chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
   find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
 

aufs3_pkgbuild.patch

---- linux-pf/PKGBUILD	2012-09-02 05:27:30.857342774 -0300
-+++ linux-pf.new/PKGBUILD	2012-09-02 05:30:14.832331565 -0300
-@@ -421,7 +421,6 @@
- 
-   provides=('linux-pf-headers')
-   cd "${srcdir}/linux-${_basekernel}"
--  make headers_install
- 
- # c/p from linux-ARCH
- 
-@@ -531,6 +530,8 @@
+--- PKGBUILD-noaufs	2012-09-04 23:45:13.688810363 +0300
++++ PKGBUILD	2012-09-04 23:42:39.377810810 +0300
+@@ -549,6 +549,8 @@
      cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
    done
  
-+  make INSTALL_HDR_PATH=${pkgdir}/usr/src/linux-${_kernver} headers_install
++  make INSTALL_HDR_PATH="${pkgdir}/usr/src/linux-${_kernver}" headers_install
 +
    chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
    find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
+