Sun Mar 4 00:01:47 UTC 2012

4 files changed, 14 insertions, 11 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index f31815bb3..5b8430f86 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,8 +13,8 @@ _kernelname=${pkgname#linux-libre}
 _basekernel=3.2
 _sublevel=9
 pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.7  # nearly always the same as pkgver
-pkgrel=1
+_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -36,8 +36,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
 md5sums=('27c641c4f6785fc647cdd3e44963a55c'
          '8e601878ccdd37111cc84500ebd81387'
-         '79db8a444fd149e409f706830d8cee9a'
-         'e26dbcb367a2b48f5ed09560e2ae8fa0'
+         '921f108c7a4985f7f8b41d72ca9bf915'
+         'f18ac3f790b0daa43f21dda04cceb90b'
          'a8a3843046926eb7ab81312cd438c5c5'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -101,7 +101,7 @@ build() {
         -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" \
-        -e "s|(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*|\1=y|g"
+        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
         ./.config
   else
     cat "${srcdir}/config.${CARCH}" > ./.config # simpler
@@ -136,6 +136,9 @@ 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} vmlinux vmlinuz modules
@@ -226,7 +229,7 @@ package_linux-libre-headers() {
 
 # In case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
-    cd ${srcdir}/linux-$pkgver
+    cd "${srcdir}/linux-${_basekernel}"
     _kernver="$(make kernelrelease)"
   fi
 
@@ -260,7 +263,7 @@ package_linux-libre-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/config.i686 b/libre/linux-libre/config.i686
index d2d688197..5a50c4e04 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -4053,7 +4053,7 @@ CONFIG_FB_I810_I2C=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 80ea3030f..441d23e6f 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -3880,7 +3880,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 62f5d13bc..ea00c881c 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -8,7 +8,7 @@ post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  if [ command -v mkinitcpio 2>&1 > /dev/null ]; then
+  if command -v mkinitcpio 2>&1 > /dev/null; then
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
@@ -52,7 +52,7 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  if [ command -v mkinitcpio 2>&1 > /dev/null ]; then
+  if command -v mkinitcpio 2>&1 > /dev/null; then
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi