Mon Mar 5 00:01:22 UTC 2012

2 files changed, 43 insertions, 17 deletions

diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 0c9e95b83..63463cc0a 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -8,7 +8,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.0
-pkgver=${_basekernel}.22
+_sublevel=23
+pkgver=${_basekernel}.${_sublevel}
+_lxopkgver=${_basekernel}.22 # nearly always the same as pkgver
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -17,7 +19,6 @@ makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -27,10 +28,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
-        'ext4-options.patch')
+        'ext4-options.patch'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
 md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         'ddc0925df01b70f6eef95e9b4160f28a'
-         '248d057fd2341d315ada5e844cdbdc1f'
+         '5b6f929403ddad35a65b934ed5df2f8a'
          '054af37f538b74a8090fc3e783a2edfa'
          'e195768d5b8cbe788dbe615561d4314f'
          'd2c0701480bce49fd4b40dc46b9863f1'
@@ -39,7 +40,13 @@ md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '74d2b710d6c97aee441d7566f8f68815')
+         '74d2b710d6c97aee441d7566f8f68815'
+         '248d057fd2341d315ada5e844cdbdc1f')
+if [ "$CARCH" != "mips64el" ]; then
+    # Don't use the Loongson-specific patches on non-mips64el arches.
+    unset source[${#source[@]}-1]
+    unset md5sums[${#md5sums[@]}-1]
+fi
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -71,16 +78,22 @@ build() {
 
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" 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 "${srcdir}/lxo-config.patch"
+    patch -Np0 -i lxo-config.patch
 
-# ensure N32, add localversion and remove uevent helper as per
+# ensure N32, add localversion, remove uevent helper as per
 # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-    sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+# 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_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
-        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config
+        -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \
+        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
+        ./.config
   else
     cat "${srcdir}/config.${CARCH}" > ./.config # simpler
   fi
@@ -114,7 +127,12 @@ build() {
 
   # build!
   if [ "$CARCH" == "mips64el" ]; then
-    make ${MAKEFLAGS} vmlinuz modules
+    # 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} vmlinux vmlinuz modules
   else
     make ${MAKEFLAGS} bzImage modules
   fi
@@ -123,13 +141,19 @@ build() {
 package_linux-libre-lts() {
   pkgdesc="The Linux-libre Kernel and modules - stable longtime supported kernel package suitable for servers"
   groups=('base')
-  depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
+  depends=('coreutils' 'module-init-tools>=3.16')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26-lts' "linux-lts=$pkgver")
   conflicts=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts')
   replaces=('kernel26-lts' 'kernel26-libre-lts' 'linux-lts')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.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}"
 
@@ -144,6 +168,7 @@ package_linux-libre-lts() {
 
   if [ "$CARCH" == "mips64el" ]; then
     cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}"
+    cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}"
   else
     cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}"
   fi
@@ -195,7 +220,7 @@ package_linux-libre-lts-headers() {
 
 # In case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
-    cd ${srcdir}/linux-$pkgver
+    cd "${srcdir}/linux-${_basekernel}"
     _kernver="$(make kernelrelease)"
   fi
 
@@ -229,7 +254,7 @@ package_linux-libre-lts-headers() {
 
   if [ "$CARCH" = "mips64el" ]; then
     cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
-    cp "arch/${KARCH}/loongson" "${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
 
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 6cf57ce44..2de3804e6 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.22-1-LIBRE-LTS
+KERNEL_VERSION=3.0.23-1-LIBRE-LTS
 
 post_install () {
   # updating module dependencies
@@ -17,8 +17,9 @@ post_install () {
     [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
     if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
       # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img /boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img /boot/kernel26${KERNEL_NAME}-fallback.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
+        boot/kernel26${KERNEL_NAME}-fallback.img
       ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
     fi
   fi