Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 12 insertions, 13 deletions

diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index bb72f209f..61bbef162 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184141 2013-05-02 15:29:52Z tpowa $
+# $Id: PKGBUILD 184766 2013-05-08 09:12:14Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,7 +7,7 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=76
+_sublevel=77
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.76 # nearly always the same as pkgver
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('f30a562307b6f71204370fcd33756466'
-         'e405de6581d02d44c2c06a81a1d93f93'
+         '8b2ca0f6a92462ba9e544f02fc450c03'
          'fe0e9b4415b82f306fc1b63eb9a742a4'
          '69a689019ea0b6ed46b387907f14bc8a'
          'c072b17032e80debc6a8626299245d46'
@@ -387,7 +387,7 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,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,score,sh,sh64,sparc,sparc64,tile,um,unicore32,v850,xtensa}
   if [ "$CARCH" = "mips64el" ]; then
     rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
   else
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index d4fbc8398..0030c7ce2 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.76-1-LIBRE-LTS
+KERNEL_VERSION=3.0.77-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 8a578eeda..e167382d1 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -108,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800'
          'c7951fe6888d939f3a7d0dafe477e82b'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
-         '5ea240a7f85a1f2e875dbd247a6982aa'
+         '8db59591250dd0c7b395a394caa4f246'
          '50387fba578646a9d29de3f917a199d2')
 
 prepare() {
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index dec34abb9..1e91c5b96 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -420,7 +420,7 @@
  echo "Successfully generated '$CNF' and '$ENV'."
 --- VirtualBox-4.2.12.orig/Makefile.kmk	2013-04-12 07:33:55.000000000 -0300
 +++ VirtualBox-4.2.12/Makefile.kmk	2013-05-09 23:09:45.756804164 -0300
-@@ -177,41 +177,6 @@
+@@ -177,40 +177,6 @@
    INSTALLS += buildserver-additions
   endif
  
@@ -458,11 +458,10 @@
 -buildserver-additions-affinity-hack:
 -	$(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip.tmp
 - endif
--endif # VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER
+ endif # VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER
  
  
- #
-@@ -327,18 +292,6 @@
+@@ -327,18 +293,6 @@
  ifn1of ($(KBUILD_TARGET), l4 linux win)
   VBOX_PATH_STAGED ?= .
  
@@ -481,7 +480,7 @@
   # guesttool.exe
   ifndef VBOX_WITH_WIN32_ADDITIONS
    ifneq ($(wildcard $(VBOX_PATH_STAGED)/guesttool.exe),)
-@@ -388,7 +341,6 @@
+@@ -388,7 +342,6 @@
  	include/VBox \
  	include/VBox/vmm \
  	include/VBox/com \
@@ -489,7 +488,7 @@
  	include/VBox/HostServices \
  	include/VBox/GuestHost \
  	include/VBox/HGSMI \
-@@ -983,17 +935,8 @@
+@@ -983,17 +936,8 @@
  
  additions-packing:
  	+ $(KMK) VBOX_ONLY_ADDITIONS=1 \
@@ -507,7 +506,7 @@
  		-C src/VBox/Additions \
  		$(VBOX_PATH_ADDITIONS)/VBoxGuestAdditions.zip
  
-@@ -1010,200 +953,6 @@
+@@ -1010,200 +954,6 @@
  
  
  #