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

1 files changed, 68 insertions, 125 deletions

diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
index ed0f4ac77..2d72f2169 100644
--- a/kernels/linux-libre-lts-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -7,65 +7,69 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-pkgbase=linux-libre-lts-knock # Build stock -libre-lts-knock kernel
-#pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.10
-_sublevel=53
-_knockpatchver=${_basekernel}
-pkgver=${_basekernel}.${_sublevel}
+pkgbase=linux-libre-lts-knock # Build stock -lts-knock kernel
+_pkgbasever=3.10-gnu
+_pkgver=3.10.53-gnu
+_knockpatchver=3.10
+
+_replaces=('kernel26%' 'kernel26-libre%' 'linux%' 'linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
+
+_srcname=linux-${_pkgbasever%-*}
+pkgver=${_pkgver//-/.}
 pkgrel=1
-_lxopkgver=${_basekernel}.52 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="https://gnunet.org/knock"
 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"
+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"
         "http://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver}.diff"
         # 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'
         'criu-no-expert.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.10.50-33c9ab76eb-loongson-community.patch')
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          '4840f0db6af66cbce923b1043971c256'
          '26380d6f05471ef8e065a77d87588009'
          '25ad0606de251a5734f4535c61452a56'
          '158cb922d9b43028f6c45c696e773915'
-         '02023949955a138c44bb0c46227a6d18'
-         '2967cecc3af9f954ccc822fd63dca6ff'
-         '8267264d9a8966e57fdacd1fa1fc65c4'
-         '04b21c79df0a952c22d681dd4f4562df'
+         ''
+         'eb14dcfd80c00852ef81ded6e826826a'
+         '071d4939e9ef4256e4c027ef3c864903'
+         '2ae9ef17f45b39ff9e6e172c0c97d263'
+         '96c2ae40e3b1cdd90fe7e6dba8078922'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '200668954d1cee93fb649196e3df8bde')
-if [ "$CARCH" != "mips64el" ]; then
-    # don't use the Loongson-specific patches on non-mips64el arches.
-    unset source[${#source[@]}-1]
-    unset md5sums[${#md5sums[@]}-1]
-fi
+         '')
 
 _kernelname=${pkgbase#linux-libre}
-_localversionname=-libre-lts-knock
+_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 -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+  # add upstream patch
+  if [ "${_pkgbasever}" != "${_pkgver}" ]; then
+    patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}"
   fi
 
   # add knock patch
   patch -p1 -i "${srcdir}/tcp_stealth_${_knockpatchver}.diff"
 
   # add freedo as boot logo
-  patch -Np1 -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
@@ -79,42 +83,22 @@ prepare() {
   # patch from fedora
   patch -Np1 -i "${srcdir}/criu-no-expert.patch"
 
-  if [ "$CARCH" == "mips64el" ]; then
-    sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts-knock|" Makefile
-    sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
-        < "${srcdir}/lxo-config.patch" > lxo-config.patch
-    msg2 "Adding loongson-community patches"
-    patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
-    patch -Np0 -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.10.50-33c9ab76eb-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 -${pkgrel}|" Makefile
+  # append pkgrel to extraversion
+  sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
 }
 
 build() {
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
   # get kernel version
   make prepare
@@ -131,10 +115,12 @@ build() {
   yes "" | make config >/dev/null
 
   # save configuration for later reuse
-  if [ "${CARCH}" = "x86_64" ]; then
-    cat .config > "${startdir}/config.x86_64.last"
-  else
+  if [ "${CARCH}" = "i686" ]; then
     cat .config > "${startdir}/config.i686.last"
+  elif [ "${CARCH}" = "x86_64" ]; then
+    cat .config > "${startdir}/config.x86_64.last"
+  elif [ "${CARCH}" = "mips64el" ]; then
+    cat .config > "${startdir}/config.mips64el.last"
   fi
 
   ####################
@@ -144,39 +130,21 @@ build() {
   ####################
 
   # build!
-  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
+  make ${MAKEFLAGS} LOCALVERSION= bzImage modules
 }
 
 _package() {
   pkgdesc="The ${pkgbase^} kernel and modules - stable longtime supported kernel package suitable for servers with support for stealth TCP sockets"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
-  depends=('coreutils' 'linux-libre-firmware' 'kmod')
+  depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}" "linux${_kernelname/-lts/}")
-  conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}" "linux${_kernelname/-lts/}" "linux-libre${_kernelname/-lts/}")
-  replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}" "linux${_kernelname/-lts/}" "linux-libre${_kernelname/-lts/}")
+  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)"
@@ -186,12 +154,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}"
 
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
@@ -205,20 +168,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
@@ -226,10 +183,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-lts-knock}" "${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-lts-knock}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--libre-lts-knock}/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"
@@ -240,12 +197,9 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}" "linux${_kernelname/-lts/}-headers")
-  conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers" "linux${_kernelname/-lts/}-headers" "linux-libre${_kernelname/-lts/}-headers")
-  replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers" "linux${_kernelname/-lts/}-headers" "linux-libre${_kernelname/-lts/}-headers")
-
-  KARCH=x86
-  [ $CARCH = "mips64el" ] && KARCH=mips
+  provides=( "${_replaces[@]/%/-headers=${pkgver}}")
+  conflicts=("${_replaces[@]/%/-headers}")
+  replaces=( "${_replaces[@]/%/-headers}")
 
   # in case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
@@ -258,7 +212,7 @@ _package-headers() {
   cd "${pkgdir}/usr/lib/modules/${_kernver}"
   ln -sf ../../../src/linux-${_kernver} build
 
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
   install -D -m644 Makefile \
     "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
   install -D -m644 kernel/Makefile \
@@ -281,12 +235,6 @@ _package-headers() {
   cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
   cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
 
-  if [ "$CARCH" = "mips64el" ]; then
-    cp arch/${KARCH}/Kbuild "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp -a arch/${KARCH}/loongson "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp ${srcdir}/Kbuild.platforms "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-  fi
-
   # fix permissions on scripts dir
   chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
@@ -390,21 +338,16 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/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/src/linux-${_kernver}/arch/x86
-  else
-    rm -rf ${pkgdir}/usr/src/linux-${_kernver}/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}" "linux${_kernelname/-lts/}-docs")
-  conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs" "linux${_kernelname/-lts/}-docs" "linux-libre${_kernelname/-lts/}-docs")
-  replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs" "linux${_kernelname/-lts/}-docs" "linux-libre${_kernelname/-lts/}-docs")
+  provides=( "${_replaces[@]/%/-docs=${pkgver}}")
+  conflicts=("${_replaces[@]/%/-docs}")
+  replaces=( "${_replaces[@]/%/-docs}")
 
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
   cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"