Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre-mips64el

Conflicts:
	core/wget/PKGBUILD
	libre/kernel26-libre/PKGBUILD

1 files changed, 8 insertions, 39 deletions

diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index 95e370c70..d109f8b94 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -10,12 +10,11 @@ pkgver=${_basekernel}
 pkgrel=1
 makedepends=('xmlto' 'docbook-xsl')
 _patchname="patch-${pkgver}-${pkgrel}-LIBRE"
-arch=(i686 x86_64 mips64el)
+arch=(i686 x86_64)
 license=('GPL2')
 url="http://linux-libre.fsfla.org/"
 options=(!strip)
 source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/linux-${pkgver}-libre.tar.bz2
-        http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2
         http://repo.parabolagnulinux.org/other/kernel26/${_patchname}.bz2
         # the main kernel config files
         config.i686 config.x86_64
@@ -76,11 +75,7 @@ build() {
   ####################
   yes "" | make config
   # build!
-  if [ "$CARCH" == "mips64el" ]; then
-    make ${MAKEFLAGS} vmlinuz modules
-  else
-    make ${MAKEFLAGS} bzImage modules
-  fi
+  make ${MAKEFLAGS} bzImage modules
 }
 
 package_kernel26-libre() {
@@ -102,20 +97,13 @@ package_kernel26-libre() {
   optdepends=('crda: to set the correct wireless channels of your country')
 
   KARCH=x86
-  [[ $CARCH = "mips64el" ]] && KARCH=mips
   cd ${srcdir}/linux-$pkgver
   # get kernel version
   _kernver="$(make kernelrelease)"
   mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot}
   make INSTALL_MOD_PATH=${pkgdir} modules_install
   cp System.map ${pkgdir}/boot/System.map26${_kernelname}
-
-  if [ "$CARCH" == "mips64el" ]; then
-    cp vmlinuz ${pkgdir}/boot/vmlinuz26${_kernelname}
-  else
-    cp arch/$KARCH/boot/bzImage ${pkgdir}/boot/vmlinuz26${_kernelname}
-    install -m644 -D vmlinux.32 ${pkgdir}/usr/src/linux-${_kernver}/vmlinux32
-  fi
+  cp arch/$KARCH/boot/bzImage ${pkgdir}/boot/vmlinuz26${_kernelname}
   #  # add vmlinux
   install -m644 -D vmlinux ${pkgdir}/usr/src/linux-${_kernver}/vmlinux
 
@@ -147,9 +135,6 @@ package_kernel26-libre-headers() {
   replaces=('kernel26-headers')
   conflicts=('kernel26-headers')
   KARCH=x86
-  [[ $CARCH = "mips64el" ]] && KARCH=mips
-  cd ${srcdir}/linux-$pkgver
-  _kernver="$(make kernelrelease)"
   mkdir -p ${pkgdir}/lib/modules/${_kernver}
   cd ${pkgdir}/lib/modules/${_kernver}
   ln -sf ../../../usr/src/linux-${_kernver} build
@@ -168,13 +153,8 @@ package_kernel26-libre-headers() {
   done
 
   # copy arch includes for external modules
-  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
-  cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
-  if [ "$CARCH" = "mips64el" ]; then
-    cp -a arch/$KARCH/Kbuild ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
-    cp -a arch/$KARCH/loongson ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
-    cp -a $srcdir/Kbuild.platforms ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
-  fi
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
+  cp -a arch/x86/include ${pkgdir}/usr/src/linux-${_kernver}/arch/x86/
 
   # copy files necessary for later builds, like nvidia and vmware
   cp Module.symvers ${pkgdir}/usr/src/linux-${_kernver}
@@ -198,10 +178,6 @@ package_kernel26-libre-headers() {
    mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
    cp -a drivers/media/video/$i/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
   done
-  if [ "$CARCH" != "mips64el" ]; then
-    mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/staging/usbvideo/
-    cp -a drivers/staging/usbvideo/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/staging/usbvideo/
-  fi
   # add docbook makefile
   install -D -m644 Documentation/DocBook/Makefile \
     ${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile
@@ -222,10 +198,8 @@ package_kernel26-libre-headers() {
   # add dvb headers for external modules
   # in reference to:
   # http://bugs.archlinux.org/task/11194
-  if [ "$CARCH" != "mips64el" ]; then
-    mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
-    cp include/config/dvb/*.h ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
-  fi
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
+  cp include/config/dvb/*.h ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
   # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
   # in reference to:
   # http://bugs.archlinux.org/task/13146
@@ -265,12 +239,7 @@ package_kernel26-libre-headers() {
     esac 
   done 
   # remove unneeded architectures
-  rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,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
+  rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
 
 package_kernel26-libre-docs() {