diff options
-rw-r--r-- | extra/evolution-data-server/PKGBUILD | 2 | ||||
-rw-r--r-- | extra/xorg-iceauth/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/kernel26-libre/PKGBUILD | 78 |
3 files changed, 64 insertions, 18 deletions
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 040385490..f4b528fbf 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -5,7 +5,7 @@ pkgname=evolution-data-server pkgver=3.0.2.1 pkgrel=1 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') makedepends=('intltool' 'gperf' 'gobject-introspection') options=('!libtool') diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD index 9063e3a4d..8af9aa2b0 100644 --- a/extra/xorg-iceauth/PKGBUILD +++ b/extra/xorg-iceauth/PKGBUILD @@ -5,7 +5,7 @@ pkgname=xorg-iceauth pkgver=1.0.5 pkgrel=1 pkgdesc="ICE authority file utility" -arch=(i686 x86_64) +arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('libice') diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index ef53c66b2..55890ba16 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -7,23 +7,33 @@ pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Buil _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.39 pkgver=${_basekernel}.2 -pkgrel=1 +pkgrel=2 makedepends=('xmlto' 'docbook-xsl') -_patchname="patch-${pkgver}-${pkgrel}-LIBRE" -arch=(i686 x86_64) +#_patchname="patch-${pkgver}-${pkgrel}-LIBRE" +_patchname="patch-2.6.39.1-1-LIBRE" +arch=(i686 x86_64 mips64el) 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 # standard config files for mkinitcpio ramdisk kernel26.preset - kernel26.install Kbuild Kbuild.platforms kernel26.install) +md5sums=('4ddca7df15f92537b1914ab115cb4f8b' + 'cff48db79d27731e46af0653788a186d' + '252cbddfd9a8bb97181c087fdd5e2377' + 'd5c6c675662d98011513f6cbc81d66db' + '00e8553b44dac65fc093db60a1cde842' + '25584700a0a679542929c4bed31433b6' + '2967cecc3af9f954ccc822fd63dca6ff' + '8267264d9a8966e57fdacd1fa1fc65c4' + 'fdfed5e8b46f289617ee6def01978090') build() { cd ${srcdir}/linux-$pkgver @@ -32,13 +42,17 @@ build() { patch -Np1 -i ${srcdir}/${_patchname} if [ "$CARCH" == "mips64el" ]; then - sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile +# Fix for lxo-config.patch Makefile + sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =.${pkgver##*.}-libre|" Makefile + msg2 "Adding loongson-community patches" patch -Np1 -i ${srcdir}/$pkgver-*-loongson-community.patch +# This is the config file patch -Np0 -i ${srcdir}/lxo-config.patch -# ensure N32 - sed -i "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" ./.config + sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config + sed -i "s|CONFIG_LOGO_LIBRE_CLUT224=.*|CONFIG_LOGO_LIBRE_CLUT224=y|g" ./.config + sed -i "s|CONFIG_LOGO_LINUX_CLUT224=.*|CONFIG_LOGO_LINUX_CLUT224=|g" ./.config # build with -Wno-error cp --remove-destination ${srcdir}/Kbuild arch/mips/ @@ -58,6 +72,7 @@ build() { sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config fi # get kernel version + make oldconfig # using old config from previous kernel version make prepare # load configuration # Configure the kernel. Replace the line below with one of your choice. @@ -72,9 +87,13 @@ build() { #msg "Stopping build" #return 1 #################### - yes "" | make config # build! - make ${MAKEFLAGS} bzImage modules + #yes "" | make config + if [ "$CARCH" == "mips64el" ]; then + make ${MAKEFLAGS} vmlinuz modules + else + make ${MAKEFLAGS} bzImage modules + fi } package_kernel26-libre() { @@ -96,13 +115,20 @@ 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} - cp arch/$KARCH/boot/bzImage ${pkgdir}/boot/vmlinuz26${_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 # # add vmlinux install -m644 -D vmlinux ${pkgdir}/usr/src/linux-${_kernver}/vmlinux @@ -134,6 +160,9 @@ 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 @@ -152,8 +181,13 @@ package_kernel26-libre-headers() { done # copy arch includes for external modules - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 - cp -a arch/x86/include ${pkgdir}/usr/src/linux-${_kernver}/arch/x86/ + 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 # copy files necessary for later builds, like nvidia and vmware cp Module.symvers ${pkgdir}/usr/src/linux-${_kernver} @@ -177,6 +211,10 @@ 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 @@ -197,8 +235,10 @@ package_kernel26-libre-headers() { # add dvb headers for external modules # in reference to: # http://bugs.archlinux.org/task/11194 - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/ - cp include/config/dvb/*.h ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/ + 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 # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new # in reference to: # http://bugs.archlinux.org/task/13146 @@ -238,7 +278,13 @@ 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,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} + 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 + } package_kernel26-libre-docs() { @@ -249,7 +295,7 @@ conflicts=('kernel26-docs') cd ${srcdir}/linux-$pkgver mkdir -p $pkgdir/usr/src/linux-$_kernver -mv Documentation $pkgdir/usr/src/linux-$_kernver +cp -r Documentation $pkgdir/usr/src/linux-$_kernver/ find $pkgdir -type f -exec chmod 444 {} \; find $pkgdir -type d -exec chmod 755 {} \; # remove a file already in kernel26 package |