Commits

Christos Nouskas committed b978ecd

3.5.3-5 "FFS"
Fixed(?) missing headers from linux-pf-headers

  • Participants
  • Parent commits ee0717c

Comments (0)

Files changed (1)

 #_subversion=1
 _basekernel=${_major}.${_minor}
 _pkgname=linux-pf
+pkgbase=${_pkgname}
 _pfrel=3
 _kernelname=-pf
 _pfpatchhome="http://pf.natalenko.name/sources/${_basekernel}/"
 pkgname=('linux-pf')
 true && pkgname=('linux-pf' 'linux-pf-headers')
 pkgver=${_basekernel}.${_pfrel}
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://pf.natalenko.name/"
 license=('GPL2')
   # Strip config of uneeded localversion
   if [ "${_kernelname}" != "" ]; then
      sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"\"|g" ./.config
+     sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
   fi
 
   # Set EXTRAVERSION to -pf
   # Build
   # Want extreme and non-sensical optimization? Uncomment the following line!
   # export KCFLAGS="-march=native -Ofast"
-  make ${MAKEFLAGS} bzImage modules
+  make ${MAKEFLAGS} LOCALVERSION= bzImage modules
 }
 
 package_linux-pf() {
 
   KARCH=x86
 
-  echo # get kernel version
-  _kernver="$(make kernelrelease)"
+  # get kernel version
+  _kernver="$(make LOCALVERSION= kernelrelease)"
 
   ### c/p from linux-ARCH
 
   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-pf.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  install -D -m644 "${srcdir}/${pkgbase}.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-pf.install"
+    -i "${startdir}/${pkgbase}.install"
   sed \
     -e "1s|'linux.*'|'${pkgbase}'|" \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:-pf}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_kernelname:--pf}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:-pf}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:-pf}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--pf}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--pf}/version"
 
   # move module tree /lib -> /usr/lib
   mv "$pkgdir/lib" "$pkgdir/usr"
 
   provides=('linux-pf-headers')
   cd "${srcdir}/linux-${_basekernel}"
+
 # c/p from linux-ARCH
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
     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 {} \;
 
 pkgdesc="Linux kernel and modules with the pf-kernel patch [-ck patchset (BFS included), TuxOnIce, BFQ] and aufs3"
 
 # makepkg -g >>PKGBUILD
-
 sha256sums=('b985ce383f0cfd940d988d4c99a84899028327aca8c29b420678241f26fdb342'
             '556261f8e1b830b53553c949c8a3a36cb90aa22c01442947ce3e2465a2d26d2a'
             'cea900cfa3961e0ecc70bc55004ff04fe7fa9bc74a3fc55efd899b2cbb948cf8'