linux-libre{,-lts,-grsec}: Remove mips64el hacks

That isn't to say "drop code allowing for flexibility around non-x86
architectures", just remove the many mips-specific hacks.

1 files changed, 14 insertions, 83 deletions

diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 872a8cdbd..55292906f 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -20,8 +20,7 @@ _timestamp=201408140023
 _pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}.${_sublevel}.${_timestamp}
 pkgrel=1
-_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64')
 url="https://grsecurity.net/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
@@ -34,11 +33,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
-        'Kbuild'
-        'Kbuild.platforms'
         'boot-logo.patch'
         '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")
+        )
 sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688'
             'c58b09c71666a79f5dcf83d05aaa5d64ab3fb83782a7dadabdc1a4e29c5b09ab'
             'b4072cb368bba37ff8d538068016f60891d5d0c1206bb9821090b08a44bf3d11'
@@ -46,19 +43,16 @@ sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688'
             'd47cc4487a687782d4010c81002a48ee0171981863ab38b9f656d6e780d4a297'
             'b4e55b41c014df808daad8105e4cbbf684df94641c213d2d9e6fc87e2a4ea59f'
             '9d2f34f1a8c514a7117b9b017a1f7312fb351f4d0b079eed102f89361534d486'
-            'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b'
-            '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9'
             'f913384dd6dbafca476fcf4ccd35f0f497dda5f3074866022facdb92647771f6'
-            '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
+            'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182')
 
 _kernelname=${pkgbase#linux-libre}
-_localversionname=-libre-grsec
+_localversioname=-libre-grsec
+
+case "$CARCH" in
+  i686|x86_64) KARCH=x86;;
+  mips64el) KARCH=mips;;
+esac
 
 prepare() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -82,27 +76,7 @@ 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
-  fi
+  cat "${srcdir}/config.${CARCH}" > ./.config
 
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" ./.config
@@ -133,22 +107,13 @@ 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
+  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-libre-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')
@@ -157,18 +122,9 @@ _package() {
   replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
   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
 
   cd "${srcdir}/linux-${_basekernel}"
 
-  KARCH=x86
-  [ $CARCH = "mips64el" ] && KARCH=mips
-
   # get kernel version
   _kernver="$(make LOCALVERSION= kernelrelease)"
   _basekernel=${_kernver%%-*}
@@ -177,12 +133,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"
@@ -201,12 +152,6 @@ _package() {
     -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
@@ -245,9 +190,6 @@ _package-headers() {
   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}"
@@ -279,12 +221,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,12 +306,7 @@ _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() {