add modifications from coadde and lukeshu contributions for linux-libre* and dependencies

1 files changed, 68 insertions, 136 deletions

diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index ba716e864..2041f3005 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id: PKGBUILD 117382 2014-08-14 07:07:04Z thestinger $
 # Maintainer (Arch): Daniel Micay <danielmicay@gmail.com>
 # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
 # Contributor (Arch): Thomas Baechler <thomas@archlinux.org>
@@ -11,68 +10,71 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-pkgbase=linux-libre-grsec   # Build stock -libre-grsec kernel
-#pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.15
-_sublevel=10
+pkgbase=linux-libre-grsec   # Build kernel with -grsec localname
+_pkgbasever=3.15-gnu
+_pkgver=3.15.10-gnu
 _grsecver=3.0
-_timestamp=201408192020
-_pkgver=${_basekernel}.${_sublevel}
-pkgver=${_basekernel}.${_sublevel}.${_timestamp}
+_timestamp=201408212335
+
+_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
+
+_srcname=linux-${_pkgbasever%-*}
+pkgver=${_pkgver//-/.}.${_timestamp}
 pkgrel=1
-_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="https://grsecurity.net/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu/patch-${_basekernel}-gnu-${_pkgver}-gnu.xz"
-        "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver}-${_timestamp}.patch"
-        "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver}-${_timestamp}.patch.sig"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
+        "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch"
+        "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig"
         # the main kernel config files
-        'config.i686' 'config.x86_64'
+        'config.i686' 'config.x86_64' 'config.mips64el'
         # standard config files for mkinitcpio ramdisk
-        "${pkgbase}.preset"
-        'Kbuild'
-        'Kbuild.platforms'
-        'boot-logo.patch'
+        'linux.preset'
+        'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm}
         'change-default-console-loglevel.patch'
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
+        # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/
+        '3.15.7-2704e67ebc-loongson-community.patch')
 sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688'
             'c58b09c71666a79f5dcf83d05aaa5d64ab3fb83782a7dadabdc1a4e29c5b09ab'
-            '4d5433830813a84ada91d255da0e5d5dc030fc9f3c3879dba5dd91a2e2d766bf'
+            '13f4ca6702a9985c68e045b510552f5f122938e1ed3264990aaae82a4f64d67a'
             'SKIP'
             'd47cc4487a687782d4010c81002a48ee0171981863ab38b9f656d6e780d4a297'
             'b4e55b41c014df808daad8105e4cbbf684df94641c213d2d9e6fc87e2a4ea59f'
-            '9d2f34f1a8c514a7117b9b017a1f7312fb351f4d0b079eed102f89361534d486'
-            'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b'
-            '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9'
-            'f913384dd6dbafca476fcf4ccd35f0f497dda5f3074866022facdb92647771f6'
+            ''
+            'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
+            '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
+            '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53'
+            'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015'
             'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
-            '1a0c1d5e3c46306766304663e9d4503ca452c4f93d5154a4ca43a03588e20d00')
-if [ "$CARCH" != "mips64el" ]; then
-    # don't use the Loongson-specific patches on non-mips64el arches.
-    unset source[${#source[@]}-1]
-    unset sha256sums[${#sha256sums[@]}-1]
-fi
+            '3854de5c0be17555dc0c5b4ec4e831225eaacf413395d74568a06abcddf3a242')
 
 _kernelname=${pkgbase#linux-libre}
-_localversionname=-libre-grsec
+_replaces=("${_replaces[@]/\%/${_kernelname}}")
+
+case "$CARCH" in
+  i686|x86_64) KARCH=x86;;
+  mips64el) KARCH=mips;;
+esac
 
 prepare() {
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
-  if [ "${_basekernel}" != "${_pkgver}" ]; then
-    patch -p1 -i "${srcdir}/patch-${_basekernel}-gnu-${_pkgver}-gnu"
+  # add upstream patch
+  if [ "${_pkgbasever}" != "${_pkgver}" ]; then
+    patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}"
   fi
 
   # add grsecurity patches
-  patch -Np1 -i "${srcdir}/grsecurity-${_grsecver}-${_pkgver}-${_timestamp}.patch"
+  patch -Np1 -i "${srcdir}/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch"
   rm localversion-grsec
 
   # add freedo as boot logo
-  patch -p1 -i "${srcdir}/boot-logo.patch"
+  install -m644 -t drivers/video/logo \
+    "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@@ -82,35 +84,15 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  if [ "$CARCH" == "mips64el" ]; then
-    sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile
-    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
-        < "${srcdir}/lxo-config.patch" > lxo-config.patch
-    msg2 "Adding loongson-community patches"
-    patch -p1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
-    patch -p0 -i lxo-config.patch
-
-  # ensure N32, add localversion, remove uevent helper as per
-  # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-  # and make USB storage support builtin (e.g. for booting from USB
-  # disks without slowly loading an initramfs)
-    sed -ri \
-        -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
-        -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
-        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
-        ./.config
-  else
-    cat "${srcdir}/config.${CARCH}" > ./.config # simpler
+  # Adding loongson-community patch
+  if [ "${CARCH}" == "mips64el" ]; then
+    patch -p1 -i ${srcdir}/3.15.7-2704e67ebc-loongson-community.patch
   fi
 
-  if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" ./.config
-    sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
-  fi
+  cat "${srcdir}/config.${CARCH}" > ./.config
 
-  # set extraversion to pkgrel
-  sed -ri "s|^(EXTRAVERSION =).*|\1 .${_timestamp}-${pkgrel}|" Makefile
+  # append pkgrel to extraversion
+  sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${_timestamp}-${pkgrel}|" Makefile
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
@@ -131,43 +113,25 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/linux-${_basekernel}"
-
-  if [ "$CARCH" == "mips64el" ]; then
-    # The build system passes it directly to linker, disable to avoid
-    # having unknown -Wl,... options.
-    export LDFLAGS=""
-    # bzImage is arch-specific and not supported on mips; vmlinux is
-    # useful for oprofile.
-    make ${MAKEFLAGS} LOCALVERSION= vmlinux vmlinuz modules
-  else
-    make ${MAKEFLAGS} LOCALVERSION= bzImage modules
-  fi
+  cd "${srcdir}/${_srcname}"
+
+  make ${MAKEFLAGS} LOCALVERSION= bzImage modules
 }
 
 _package() {
   pkgdesc="The ${pkgbase^} kernel and modules with grsecurity/PaX patches"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
-  depends=('coreutils' 'linux-libre-firmware' 'kmod' 'grsec-common')
+  depends=('coreutils' 'linux-firmware' 'kmod' 'grsec-common' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country'
               'gradm: to configure and enable Role Based Access Control (RBAC)'
               'paxd: to enable PaX exploit mitigations and apply exceptions automatically')
-  provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
-  conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
-  replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+  provides=( "${_replaces[@]/%/=${pkgver}}")
+  conflicts=("${_replaces[@]}")
+  replaces=( "${_replaces[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
-  install=${pkgbase}.install
-  if [ "$CARCH" = "mips64el" ]; then
-      optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
-      conflicts+=('mkinitcpio<0.7')
-  else
-      depends+=('mkinitcpio>=0.7')
-  fi
+  install=linux.install
 
-  cd "${srcdir}/linux-${_basekernel}"
-
-  KARCH=x86
-  [ $CARCH = "mips64el" ] && KARCH=mips
+  cd "${srcdir}/${_srcname}"
 
   # get kernel version
   _kernver="$(make LOCALVERSION= kernelrelease)"
@@ -176,13 +140,7 @@ _package() {
 
   mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
   make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
-
-  if [ "$CARCH" == "mips64el" ]; then
-    cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}"
-    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}"
-  else
-    cp arch/${KARCH}/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
-  fi
+  cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
 
   # set correct depmod command for install
   cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
@@ -193,20 +151,14 @@ _package() {
     -i "${startdir}/${install}"
 
   # install mkinitcpio preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
   sed \
-    -e "1s|'linux*.*'|'${pkgbase}'|" \
+    -e "1s|'linux.*'|'${pkgbase}'|" \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
     -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
     -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
 
-  # mkinitcpio 0.7 relies on bzImage to find the kernel version
-  if [ "$CARCH" == "mips64el" ]; then
-    sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
-        -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-  fi
-
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
   # remove the firmware
@@ -214,10 +166,10 @@ _package() {
   # 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}${_localversionname:--libre-grsec}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_kernelname}" "${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}${_localversionname:--libre-grsec}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--libre-grsec}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname}/version"
 
   # Now we call depmod...
   depmod -b "${pkgdir}" -F System.map "${_kernver}"
@@ -241,22 +193,13 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
-  conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
-  replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
-
-  KARCH=x86
-  [ $CARCH = "mips64el" ] && KARCH=mips
-
-  # in case of repackaging this is empty
-  if [ -z "${_kernver}" ]; then
-    cd "${srcdir}/linux-${_basekernel}"
-    _kernver="$(make LOCALVERSION= kernelrelease)"
-  fi
+  provides=( "${_replaces[@]/%/-headers=${pkgver}}")
+  conflicts=("${_replaces[@]/%/-headers}")
+  replaces=( "${_replaces[@]/%/-headers}")
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
   install -D -m644 Makefile \
     "${pkgdir}/usr/lib/modules/${_kernver}/build/Makefile"
   install -D -m644 kernel/Makefile \
@@ -279,12 +222,6 @@ _package-headers() {
   cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build"
   cp -a scripts "${pkgdir}/usr/lib/modules/${_kernver}/build"
 
-  if [ "$CARCH" = "mips64el" ]; then
-    cp arch/${KARCH}/Kbuild "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-    cp -a arch/${KARCH}/loongson "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-    cp ${srcdir}/Kbuild.platforms "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-  fi
-
   # fix permissions on scripts dir
   chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts"
   mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions"
@@ -370,21 +307,16 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
-  if [ "$CARCH" = "mips64el" ]; then
-    rm -rf ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/x86
-  else
-    rm -rf ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/mips
-  fi
+  find "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch -mindepth 1 -maxdepth 1 -type d -not -name "$KARCH" -exec rm -rf {} +
 }
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
-  conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
-  replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
+  provides=( "${_replaces[@]/%/-docs=${pkgver}}")
+  conflicts=("${_replaces[@]/%/-docs}")
+  replaces=( "${_replaces[@]/%/-docs}")
 
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
   mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build"
   cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build"