From adbab22155e99a75ed37dcfe4aaa156058258c7b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 15 Mar 2012 15:27:20 -0300 Subject: libre/linux-libre --- libre/linux-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 72723f5b1..36be2cd14 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -101,7 +101,7 @@ build() { 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" \ + -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" \ -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \ ./.config else -- cgit v1.2.3-54-g00ecf From ab03df8f46d1bc466158573215928f8965d85558 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 15 Mar 2012 16:10:44 -0300 Subject: libre/linux-libre-lts --- libre/linux-libre-lts/.directory | 2 ++ libre/linux-libre-lts/PKGBUILD | 12 ++++++------ libre/linux-libre-lts/linux-libre-lts.install | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 libre/linux-libre-lts/.directory diff --git a/libre/linux-libre-lts/.directory b/libre/linux-libre-lts/.directory new file mode 100644 index 000000000..60156bc93 --- /dev/null +++ b/libre/linux-libre-lts/.directory @@ -0,0 +1,2 @@ +[Dolphin] +Timestamp=2012,3,15,16,10,14 diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index cbbaa63b0..28cb4339d 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,10 +9,10 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=23 +_sublevel=24 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.22 # nearly always the same as pkgver -pkgrel=3 +_lxopkgver=${_basekernel}.24 # nearly always the same as pkgver +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li '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' - '5b6f929403ddad35a65b934ed5df2f8a' + '6e746bffa81b08f165d3a5328eac0454' '054af37f538b74a8090fc3e783a2edfa' 'e195768d5b8cbe788dbe615561d4314f' 'd2c0701480bce49fd4b40dc46b9863f1' @@ -42,7 +42,7 @@ md5sums=('44e7bc20c235a193f9b6123a8d5e9509' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' '74d2b710d6c97aee441d7566f8f68815' - '248d057fd2341d315ada5e844cdbdc1f') + '0b11552c826f65b666dfb53f2c8c12bb') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -92,7 +92,7 @@ build() { 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" \ + -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" \ -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \ ./.config else diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index ab23b07a1..642e9d52d 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.23-3-LIBRE-LTS +KERNEL_VERSION=3.0.24-1-LIBRE-LTS post_install () { # updating module dependencies -- cgit v1.2.3-54-g00ecf From b2471c84ef9e31dd8fb53255148619c815d8b9eb Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 15 Mar 2012 18:40:05 -0300 Subject: libre/virtualbox-libre --- libre/virtualbox-libre/LocalConfig.kmk | 2 +- libre/virtualbox-libre/PKGBUILD | 70 +++++++++++++-------- libre/virtualbox-libre/gsoap.patch | 11 ++++ libre/virtualbox-libre/vbox-service.rc | 2 +- libre/virtualbox-libre/vboxbuild | 1 - libre/virtualbox-libre/vboxdrv-reference.patch | 4 +- libre/virtualbox-libre/vboxweb.conf | 11 ++++ libre/virtualbox-libre/vboxweb.rc | 86 ++++++++++++++++++++++++++ libre/virtualbox-libre/virtualbox.install | 2 +- 9 files changed, 156 insertions(+), 33 deletions(-) create mode 100644 libre/virtualbox-libre/gsoap.patch create mode 100644 libre/virtualbox-libre/vboxweb.conf create mode 100644 libre/virtualbox-libre/vboxweb.rc diff --git a/libre/virtualbox-libre/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk index e5cbcebcd..d42cd3e1f 100644 --- a/libre/virtualbox-libre/LocalConfig.kmk +++ b/libre/virtualbox-libre/LocalConfig.kmk @@ -14,6 +14,6 @@ VBOX_WITH_REGISTRATION_REQUEST = VBOX_WITH_UPDATE_REQUEST = VBOX_WITH_VNC := 1 VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk +VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk VBOX_GCC_WERR = VBOX_GCC_WARN = diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index edf35ff62..73e443d6a 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,5 +1,6 @@ # $Id: PKGBUILD 63763 2012-02-05 12:13:00Z ibiru $ -# Maintainer: Nicolas Reynolds +# Maintainer (Parabola): Nicolas Reynolds +# Contributor (Parabola): Jorge López # Changes: # * Adapt to linux-libre # * virtualbox-{archlinux,parabola}-* @@ -9,35 +10,41 @@ #Maintainer: Ionut Biru pkgbase=virtualbox-libre pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source') -pkgver=4.1.8 -pkgrel=2 +pkgver=4.1.10 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2') +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' 'gsoap' 'vde2') #'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild - change_default_driver_dir.patch vbox-service.conf vbox-service.rc) -md5sums=('2092bba46baa62fab5520d67dee2ece8' + 10-vboxdrv.rules vboxdrv-reference.patch gsoap.patch LocalConfig.kmk vboxbuild + change_default_driver_dir.patch vbox-service.conf vbox-service.rc + vboxweb.conf vboxweb.rc) + +md5sums=('263e495ef3a7ab75943af28d446ee702' '5f85710e0b8606de967716ded7b2d351' - '6ab2455c391d8cc005e2f4461ae26a3b' - '78ffa67ff131680f1d2b6f06d4325c5b' - '67688bff176d3c6fac5664dc282fea52' + '755ab0dd9bcacf2c00d2275b1ca69547' + 'b9f4da759d23b60b69b12005213c3aa7' + 'a1ff1d1b4423556887e48a32978226a6' + '3c96faa76894c182c1bb56bb30d9a17e' '97e193f050574dd272a38e5ee5ebe62b' '3c08ad30b89add47d3f45121200a5360' - 'e7416331d0bc331f3b5aae3e5d104642') + '208cf5f842eb2e3a5b6dcfc59080d26c' + '3ac185709bfe688bb753c46e170d0546' + 'c159d683ba1947290fc2ad2c64194150') _extramodules=extramodules-3.2-LIBRE _kernver="$(cat /lib/modules/${_extramodules}/version)" build() { - cd "$srcdir/VirtualBox-${pkgver}_OSE" + cd "$srcdir/VirtualBox-${pkgver}" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" patch -Np1 -i "$srcdir/change_default_driver_dir.patch" + patch -Np0 -i "$srcdir//gsoap.patch" cp "$srcdir/LocalConfig.kmk" . @@ -66,11 +73,12 @@ package_virtualbox-libre() { provides=("virtualbox=$pkgver") install=virtualbox.install - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + source "$srcdir/VirtualBox-${pkgver}/env.sh" - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin" mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls} + #Binaries and Wrapper with Launchers install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox" @@ -116,23 +124,30 @@ package_virtualbox-libre() { echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" #udev and licence - install -D -m 0644 "$srcdir/VirtualBox-${pkgver}_OSE/COPYING" \ + install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \ "$pkgdir/usr/share/licenses/virtualbox/LICENSE" install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules" + + # install rc.d script + install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb" + # install sample config + install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb" + } package_virtualbox-source() { pkgdesc="VirtualBox kernel modules source" depends=(gcc make) provides=(virtualbox-modules) - optdepends=('linux-libre-headers') + optdepends=('linux-libre-headers' + 'linux-libre-lts-headers') install=virtualbox-source.install - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + source "$srcdir/VirtualBox-${pkgver}/env.sh" mkdir -p $pkgdir/usr/lib/virtualbox - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin" #sources for modules cp -r src ${pkgdir}/usr/lib/virtualbox @@ -146,8 +161,8 @@ package_virtualbox-sdk() { mkdir -p "$pkgdir/usr/lib/virtualbox" - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + source "$srcdir/VirtualBox-${pkgver}/env.sh" + cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin" install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" #python sdk @@ -165,19 +180,19 @@ package_virtualbox-parabola-additions(){ conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions') provides=("virtualbox-archlinux-additions=${pkgver}") - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + source "$srcdir/VirtualBox-${pkgver}/env.sh" - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" + cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" install -d "$pkgdir"/{usr/bin,sbin} install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" install -m755 mount.vboxsf "$pkgdir/sbin" - install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ + install -m755 -D "$srcdir"/VirtualBox-${pkgver}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ "$pkgdir"/usr/bin/VBoxClient-all - install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ + install -m755 -D "$srcdir"/VirtualBox-${pkgver}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxvideo_drv_111.so \ + install -D vboxvideo_drv_112.so \ "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" install -d "$pkgdir/usr/lib/xorg/modules/dri" install -m755 VBoxOGL*.so "$pkgdir/usr/lib" @@ -185,8 +200,9 @@ package_virtualbox-parabola-additions(){ install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so" # install rc.d script - install -D -m755 "${srcdir}/vbox-service.rc" "${pkgdir}/etc/rc.d/vbox-service" + install -D -m755 "$srcdir/vbox-service.rc" "$pkgdir/etc/rc.d/vbox-service" # install sample config - install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service" + install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service" } + diff --git a/libre/virtualbox-libre/gsoap.patch b/libre/virtualbox-libre/gsoap.patch new file mode 100644 index 000000000..c49caa720 --- /dev/null +++ b/libre/virtualbox-libre/gsoap.patch @@ -0,0 +1,11 @@ +--- configure.orig 2012-03-14 08:40:02.447527213 +0000 ++++ configure 2012-03-14 09:05:01.535432453 +0000 +@@ -1959,7 +1959,7 @@ + else + cnf_append "VBOX_GSOAP_CXX_SOURCES" "" + fi +- cnf_append "VBOX_GSOAP_CXX_LIBS" "libgsoap++" ++ cnf_append "VBOX_GSOAP_CXX_LIBS" "libgsoapssl++ libz" + log_success "found" + else + log_failure "stlvector.h not found -- disabling webservice" diff --git a/libre/virtualbox-libre/vbox-service.rc b/libre/virtualbox-libre/vbox-service.rc index 6f1b8d892..96233f66d 100644 --- a/libre/virtualbox-libre/vbox-service.rc +++ b/libre/virtualbox-libre/vbox-service.rc @@ -27,7 +27,7 @@ case "$1" in ;; status) stat_busy "Checking $name status"; - ck_status $name + ck_status vbox-service ;; *) echo "usage: $0 {start|stop|restart|status}" diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild index e6fb94edd..4bc8e0c9d 100644 --- a/libre/virtualbox-libre/vboxbuild +++ b/libre/virtualbox-libre/vboxbuild @@ -83,4 +83,3 @@ if (( ${#MODLIST[*]} )); then stat_busy "Reloading VirtualBox kernel modules" modprobe -a "${MODLIST[@]}" && stat_done || stat_fail fi - diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch index 710e2e511..682175798 100644 --- a/libre/virtualbox-libre/vboxdrv-reference.patch +++ b/libre/virtualbox-libre/vboxdrv-reference.patch @@ -16,7 +16,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( @@ -90,11 +89,8 @@ - + QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " @@ -27,7 +27,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V + "VirtualBox. Reload the modules or if you don't use our stock kernel execute

" + " '/usr/bin/vboxbuild'

" ); - + QString g_QStrHintOtherNoDriver = QApplication::tr( diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf new file mode 100644 index 000000000..49d82d828 --- /dev/null +++ b/libre/virtualbox-libre/vboxweb.conf @@ -0,0 +1,11 @@ +# WebService Mandatory Variables +#VBOXWEB_USER= + +# WebService Variables +#VBOXWEB_LOGFILE= +#$VBOXWEB_HOST= +#$VBOXWEB_PORT= +#$VBOXWEB_TIMEOUT= +#$VBOXWEB_CHECK_INTERVAL= +#$VBOXWEB_THREADS= +#$VBOXWEB_KEEPALIVE= diff --git a/libre/virtualbox-libre/vboxweb.rc b/libre/virtualbox-libre/vboxweb.rc new file mode 100644 index 000000000..97273e3c7 --- /dev/null +++ b/libre/virtualbox-libre/vboxweb.rc @@ -0,0 +1,86 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/vbox/vbox.cfg +. /etc/conf.d/vboxweb + +BINARY="$INSTALL_DIR/vboxwebsrv" + +start() { + stat_busy "Starting VirtualBox Web Service"; + if ! pidof -o %PPID $BINARY >/dev/null; then + [[ "$VBOXWEB_USER" ]] || stat_die + lsmod | grep -q "vboxdrv[^_-]" || stat_die + PARAMS="--background" + [[ "$VBOXWEB_HOST" ]] && PARAMS+=" -H $VBOXWEB_HOST" + [[ "$VBOXWEB_PORT" ]] && PARAMS+=" -p $VBOXWEB_PORT" + [[ "$VBOXWEB_TIMEOUT" ]] && PARAMS+=" -t $VBOXWEB_TIMEOUT" + [[ "$VBOXWEB_CHECK_INTERVAL" ]] && PARAMS+=" -i $VBOXWEB_CHECK_INTERVAL" + [[ "$VBOXWEB_THREADS" ]] && PARAMS+=" -T $VBOXWEB_THREADS" + [[ "$VBOXWEB_KEEPALIVE" ]] && PARAMS+=" -k $VBOXWEB_KEEPALIVE" + [[ "$VBOXWEB_LOGFILE" ]] && PARAMS+=" -F $VBOXWEB_LOGFILE" + # prevent inheriting this setting to VBoxSVC + unset VBOX_RELEASE_LOG_DEST + su - $VBOXWEB_USER -c "$BINARY $PARAMS" &>/dev/null + # ugly: wait until the final process has forked + sleep .2 + if pidof -o %PPID $BINARY >/dev/null; then + add_daemon vboxweb + stat_done + else + stat_die + fi + else + stat_die + fi +} + +stop() { + stat_busy "Stopping VirtualBox Web Service" + PID=$(pidof -o %PPID $BINARY) + [[ $PID ]] && kill $PID &>/dev/null + if ! pidof -o %PPID $BINARY >/dev/null; then + rm_daemon vboxweb + stat_done + else + stat_die + fi +} + +restart() { + stop && start +} + +status() { + stat_busy "Checking for VirtualBox Web Service" + if pidof -o %PPID $BINARY >/dev/null; then + stat_done + else + stat_fail + false + fi +} + +case "$1" in +start) + start + ;; +stop) + stop + ;; +restart) + restart + ;; +force-reload) + restart + ;; +status) + status + ;; +*) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 +esac + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install index 29646e973..6c9baa21e 100644 --- a/libre/virtualbox-libre/virtualbox.install +++ b/libre/virtualbox-libre/virtualbox.install @@ -20,7 +20,7 @@ post_install() { post_upgrade() { getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers utils - if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then + if [ "$(vercmp $2 4.1.10-1)" -lt 0 ]; then /bin/cat << EOF ===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules. ===> Use virtualbox-source package if you don't use our stock linux-libre package. -- cgit v1.2.3-54-g00ecf From dce432e650325e7b9463e24ae987895ec73a0a39 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 15 Mar 2012 20:45:14 -0300 Subject: libre/virtualbox-modules --- libre/virtualbox-modules/PKGBUILD | 32 ++++++++++++---------- .../virtualbox-libre-modules.install | 17 ++++++++++++ .../virtualbox-modules/virtualbox-modules.install | 2 +- 3 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 libre/virtualbox-modules/virtualbox-libre-modules.install diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD index 9359edfb2..a99a9ecaf 100644 --- a/libre/virtualbox-modules/PKGBUILD +++ b/libre/virtualbox-modules/PKGBUILD @@ -1,18 +1,22 @@ # $Id: PKGBUILD 62846 2012-01-27 17:21:04Z ibiru $ #Maintainer: Ionut Biru +#Contributor (Parabola): Jorge López pkgbase=virtualbox-modules -pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') -pkgver=4.1.8 -pkgrel=3 +pkgname=('virtualbox-modules' 'virtualbox-libre-modules') +pkgver=4.1.10 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') +replaces=('virtualbox-modules') +conflicts=('virtualbox-modules') +provides=("virtualbox-modules=$pkgver") makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('2092bba46baa62fab5520d67dee2ece8' +md5sums=('263e495ef3a7ab75943af28d446ee702' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') @@ -23,7 +27,7 @@ export KERN_DIR=/lib/modules/${_kernver}/build export KERN_INCL=/usr/src/linux-${_kernver}/include/ build() { - cd "$srcdir/VirtualBox-${pkgver}_OSE" + cd "$srcdir/VirtualBox-${pkgver}" cp "$srcdir/LocalConfig.kmk" . @@ -43,22 +47,22 @@ build() { source ./env.sh kmk all - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" + make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" + make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" } -package_virtualbox-parabola-modules(){ +package_virtualbox-libre-modules(){ pkgdesc="Additions only for Parabola guests (kernel modules)" license=('GPL') - install=virtualbox-parabola-modules.install + install=virtualbox-libre-modules.install depends=('linux>=3.2' 'linux<3.3') replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules') provides=("virtualbox-archlinux-modules=$pkgver") - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + source "$srcdir/VirtualBox-${pkgver}/env.sh" - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" + cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do install -D -m644 ${module} \ @@ -70,7 +74,7 @@ package_virtualbox-parabola-modules(){ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-parabola-modules.install" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-libre-modules.install" } package_virtualbox-modules(){ @@ -79,10 +83,10 @@ package_virtualbox-modules(){ install=virtualbox-modules.install depends=('linux>=3.2' 'linux<3.3') - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + source "$srcdir/VirtualBox-${pkgver}/env.sh" - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" + cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" install -D -m644 vboxdrv.ko \ "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko" diff --git a/libre/virtualbox-modules/virtualbox-libre-modules.install b/libre/virtualbox-modules/virtualbox-libre-modules.install new file mode 100644 index 000000000..b542db1ca --- /dev/null +++ b/libre/virtualbox-modules/virtualbox-libre-modules.install @@ -0,0 +1,17 @@ +post_install() { +cat << EOF +===> You may want to load vboxguest, vboxsf and vboxvideo +EOF + EXTRAMODULES='extramodules-3.2-LIBRE' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.2-LIBRE' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.2-LIBRE' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install index 671c129d6..bc2adbe64 100644 --- a/libre/virtualbox-modules/virtualbox-modules.install +++ b/libre/virtualbox-modules/virtualbox-modules.install @@ -10,7 +10,7 @@ EOF post_upgrade() { EXTRAMODULES='extramodules-3.2-LIBRE' depmod $(cat /lib/modules/$EXTRAMODULES/version) - rmmod vboxdrv || echo 'In order to use the new version, reload all virtualbox modules manually.' + echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { -- cgit v1.2.3-54-g00ecf From 0131ecdce6061e63accdb4f32d09afc85f6d0e6e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 15 Mar 2012 21:48:34 -0300 Subject: libre/virtualbox-modules --- libre/virtualbox-modules/LocalConfig.kmk | 2 +- libre/virtualbox-modules/PKGBUILD | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libre/virtualbox-modules/LocalConfig.kmk b/libre/virtualbox-modules/LocalConfig.kmk index af79f90cd..cd4e65e03 100644 --- a/libre/virtualbox-modules/LocalConfig.kmk +++ b/libre/virtualbox-modules/LocalConfig.kmk @@ -14,6 +14,6 @@ VBOX_WITH_REGISTRATION_REQUEST = VBOX_WITH_UPDATE_REQUEST = VBOX_WITH_VNC := 1 VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk +VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk VBOX_GCC_WERR = VBOX_GCC_WARN = diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD index a99a9ecaf..690ff903e 100644 --- a/libre/virtualbox-modules/PKGBUILD +++ b/libre/virtualbox-modules/PKGBUILD @@ -1,23 +1,23 @@ # $Id: PKGBUILD 62846 2012-01-27 17:21:04Z ibiru $ #Maintainer: Ionut Biru -#Contributor (Parabola): Jorge López +#Contributor: (Parabola) Jorge Lopez pkgbase=virtualbox-modules -pkgname=('virtualbox-modules' 'virtualbox-libre-modules') +pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') pkgver=4.1.10 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') provides=("virtualbox-modules=$pkgver") -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers') +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) md5sums=('263e495ef3a7ab75943af28d446ee702' - '4c88bd122677a35f68abd76eb01b378b' + '7e921d2ae193ec04b255daa0e338d3a4' 'ed1341881437455d9735875ddf455fbe') _extramodules=extramodules-3.2-LIBRE @@ -51,11 +51,11 @@ build() { make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" } -package_virtualbox-libre-modules(){ +package_virtualbox-parabola-modules(){ pkgdesc="Additions only for Parabola guests (kernel modules)" license=('GPL') - install=virtualbox-libre-modules.install - depends=('linux>=3.2' 'linux<3.3') + install=virtualbox-parabola-modules.install + depends=('linux-libre>=3.2' 'linux-libre<3.3') replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules') provides=("virtualbox-archlinux-modules=$pkgver") @@ -74,14 +74,14 @@ package_virtualbox-libre-modules(){ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-libre-modules.install" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-parabola-modules.install" } package_virtualbox-modules(){ pkgdesc="Kernel modules for VirtualBox" license=('GPL') install=virtualbox-modules.install - depends=('linux>=3.2' 'linux<3.3') + depends=('linux-libre>=3.2' 'linux-libre<3.3') source "$srcdir/VirtualBox-${pkgver}/env.sh" -- cgit v1.2.3-54-g00ecf From 2a604e15e0a7ade176dfbe6d97007f863d3155ca Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 15 Mar 2012 21:57:34 -0300 Subject: libre/virtualbox-modules --- libre/virtualbox-modules/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD index 690ff903e..388eb8264 100644 --- a/libre/virtualbox-modules/PKGBUILD +++ b/libre/virtualbox-modules/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 62846 2012-01-27 17:21:04Z ibiru $ #Maintainer: Ionut Biru -#Contributor: (Parabola) Jorge Lopez +#Contributor (Parabola): Jorge López pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') -- cgit v1.2.3-54-g00ecf From 24d66b3bb3014936f44e555a7f1cd131f73e8acc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 15 Mar 2012 22:37:44 -0300 Subject: kernels/linux-libre-xen --- kernels/linux-libre-xen/PKGBUILD | 6 +++--- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 72d62953e..24e08b644 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -11,8 +11,8 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-XEN _basekernel=3.2 -pkgver=${_basekernel}.9 -pkgrel=2 +pkgver=${_basekernel}.11 +pkgrel=1 arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,7 +30,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'i915-gpu-finish.patch' 'ext4-options.patch') md5sums=('27c641c4f6785fc647cdd3e44963a55c' - '8e601878ccdd37111cc84500ebd81387' + '09abd6a4e9ae7373a3151b61781ab2fe' 'aafbddba8ddeca5f13bac26cd5167a6c' '81dce3388fcb0b1e8aa1070ccbfb5d62' 'b7c2805bb287a644c0a303bf7721e534' diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 609bf0a79..17653f195 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.2.9-2-LIBRE-XEN +KERNEL_VERSION=3.2.11-1-LIBRE-XEN post_install () { # updating module dependencies -- cgit v1.2.3-54-g00ecf From 6c6894e48cc7b54ecbfdbc9341c8d3cf6f3b6c51 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Fri, 16 Mar 2012 10:19:59 +0100 Subject: Update pacman. --- .../0001-makepkg-fix-removing-symbolic-link.patch | 32 ------------------ libre/pacman/PKGBUILD | 21 +++++++----- libre/pacman/pacman.conf.mips64el | 32 +++++++++++++++--- libre/pacman/rePKGBUILD | 39 ---------------------- 4 files changed, 41 insertions(+), 83 deletions(-) delete mode 100644 libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch delete mode 100644 libre/pacman/rePKGBUILD diff --git a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch b/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch deleted file mode 100644 index a14e1de69..000000000 --- a/libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c493eef643ecb3a54c79083c51a8975f816ed9de Mon Sep 17 00:00:00 2001 -From: Allan McRae -Date: Tue, 28 Jun 2011 22:47:35 +1000 -Subject: [PATCH] makepkg: fix removing symbolic link - -The path was not being stripped from $file before prefixing with -$srcdir resulting in the attempted removal of a very weird -filename. - -Signed-off-by: Allan McRae -Signed-off-by: Dan McGee -(cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c) ---- - scripts/makepkg.sh.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in -index 3ace945..b0b0882 100644 ---- a/scripts/makepkg.sh.in -+++ b/scripts/makepkg.sh.in -@@ -509,7 +509,7 @@ download_sources() { - local file=$(get_filepath "$netfile" || true) - if [[ -n "$file" ]]; then - msg2 "$(gettext "Found %s")" "${file##*/}" -- rm -f "$srcdir/$file" -+ rm -f "$srcdir/${file##*/}" - ln -s "$file" "$srcdir/" - continue - fi --- -1.7.6 - diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 00faf0842..d8d3a6d26 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,11 +1,11 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 146568 2012-01-13 16:47:02Z dreisner $ +# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $ # Maintainer: Dan McGee # Maintainer: Dave Reisner pkgname=pacman -pkgver=4.0.1 -pkgrel=4 +pkgver=4.0.2 +pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -18,15 +18,16 @@ optdepends=('fakeroot: for makepkg usage as normal user') backup=(etc/pacman.conf etc/makepkg.conf) install=pacman.install options=(!libtool) -source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz +source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} pacman.conf pacman.conf.x86_64 pacman.conf.mips64el makepkg.conf) -md5sums=('76bd88eff8cd94bc9899faa091822dc1' +md5sums=('289ba4a19a16393096e065cec1cb9b0a' + '575140dce3ea597d91b6d081aa3f6a00' '858d1ffb284afc6b15f72578ba3cac50' '7dade0c0a4d597c480d779afa4f5097c' - '150a2854816cd67b1608e00f99701c1c' + 'd4ca1a1d8e6708c0302a225628a489eb' 'debc512689a1aa8c124fe0ccf27f5758') # keep an upgrade path for older installations @@ -40,6 +41,10 @@ build() { make } +check() { + make -C "$pkgname-$pkgver" check +} + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install @@ -59,14 +64,14 @@ package() { mycarch="x86_64" mychost="x86_64-unknown-linux-gnu" myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" - myldflags="-Wl,--hash-style=gnu -Wl,--as-needed" + myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu" ;; mips64el) install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf mycarch="mips64el" mychost="mips64el-unknown-linux-gnu" myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" - myldflags="" + myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro" ;; esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el index 82955b965..a74f2d3da 100644 --- a/libre/pacman/pacman.conf.mips64el +++ b/libre/pacman/pacman.conf.mips64el @@ -13,11 +13,14 @@ #DBPath = /var/lib/pacman/ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first -SyncFirst = pacman -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +# Don't list pacman here unless you want it broken when there is a +# libarchive or glibc update. +#SyncFirst = #XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled Architecture = mips64el @@ -28,12 +31,25 @@ Architecture = mips64el #NoUpgrade = #NoExtract = -# Misc options (all disabled by default) +# Misc options #UseSyslog -#ShowSize #UseDelta #TotalDownload #CheckSpace +#VerbosePkgLists + +# PGP signature checking +# NOTE: None of this will work without running `pacman-key --init` first. +# The compiled in default is equivalent to the following line. This requires +# you to locally sign and trust packager keys using `pacman-key` for them to be +# considered valid. +#SigLevel = Optional TrustedOnly +# If you wish to check signatures but avoid local sign and trust issues, use +# the following line. This will treat any key imported into pacman's keyring as +# trusted. +#SigLevel = Optional TrustAll +# For now, off by default unless you read the above. +SigLevel = Never # # REPOSITORIES @@ -59,24 +75,31 @@ Architecture = mips64el # after the header, and they will be used before the default mirrors. #[libre-testing] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [libre] +#SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist #[testing] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [core] +#SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist [extra] +#SigLevel = PackageOptional Include = /etc/pacman.d/mirrorlist #[community-testing] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [community] +#SigLevel = PackageOptional Include = /etc/pacman.d/mirrorlist # Parabola also supports community projects and personal repositories, to find @@ -85,5 +108,6 @@ Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] +#SigLevel = Optional TrustAll #Server = file:///home/custompkgs diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD deleted file mode 100644 index 3967b90ab..000000000 --- a/libre/pacman/rePKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Nicolas Reynolds -source PKGBUILD -CARCH=x86_64 -unset build package md5sums source -_repo=core -source=(PKGBUILD - ftp://ftp.archlinux.org/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT - # files for pkg modifications - pacman.conf - pacman.conf.x86_64 - ) -options=(!strip) - -build() { - cd "${srcdir}/" - rm .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT - # put actions for package modifications below this line - -} - -package() { - cd ${srcdir} - cp -a ./* ${pkgdir} - - rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}} - -# No need to repackage for mips64el - case "$CARCH" in - i686) - install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf - ;; - x86_64) - install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf - ;; - esac -} - - -# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 54dd02cd77554542994a6db5bf6cd31e640bb990 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 18 Mar 2012 17:57:30 +0100 Subject: Fix building the mips64el cross toolchain. --- .../PKGBUILD | 1 - .../PKGBUILD | 1 - .../PKGBUILD | 19 +-------- cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD | 45 +--------------------- 4 files changed, 4 insertions(+), 62 deletions(-) diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD index ca0ca775e..2eb018125 100644 --- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD +++ b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD @@ -54,7 +54,6 @@ build() { --enable-cloog-backend=isl \ --with-libelf \ --enable-lto \ - --with-host-libstdcxx="-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lpwl" \ --enable-target-optspace \ --disable-libgomp \ --disable-libmudflap \ diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD index 831236d42..47ef81fe1 100644 --- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD +++ b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD @@ -49,7 +49,6 @@ build() { --with-ppl \ --enable-cloog-backend=isl \ --enable-lto \ - --with-host-libstdcxx="-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lpwl" \ --enable-target-optspace \ --disable-libgomp \ --disable-libmudflap \ diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD index 7fed7839a..9b03da6d7 100644 --- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD +++ b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD @@ -44,6 +44,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgname}-${pkgver}_${_glibcdate}. locale-gen) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' 'a006504b83553d0b554cf8badff005b6' + '39f80ba6bcda6b010a66f9c61e9a0017' '4dadb9203b69a3210d53514bb46f41c3' '0c5540efc51c0b93996c51b57a8540ae' '40cd342e21f71f5e49e32622b25acc52' @@ -188,6 +189,7 @@ package() { # This will help gcc-shared to find headers for libgcc2 msg2 "Symlinking headers" # rm -r ${pkgdir}${_sysroot}/include + mkdir -p ${pkgdir}${_sysroot}/lib/ ln -s ${_sysroot}/usr/include ${pkgdir}${_sysroot}/include ln -s ${_sysroot}/usr/lib/crt1.o ${pkgdir}${_sysroot}/lib/ ln -s ${_sysroot}/usr/lib/crti.o ${pkgdir}${_sysroot}/lib/ @@ -195,20 +197,3 @@ package() { ln -s ${_sysroot}/usr/lib/libc.so ${pkgdir}${_sysroot}/lib/ } -md5sums=('6ffdf5832192b92f98bdd125317c0dfc' - '98d028ee63fca2821414ebcac0af0e5b' - '39f80ba6bcda6b010a66f9c61e9a0017' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'b042647ea7d6f22ad319e12e796bd13e' - '6970bcfeb3bf88913436d5112d16f588' - '7da8c554a3b591c7401d7023b1928afc' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - '3c219ddfb619b6df903cac4cc42c611d' - '7ae3e426251ae33e73dbad71f9c91378' - 'dc7550e659ddd685bd78a930d15a01f2' - 'b587ee3a70c9b3713099295609afde49' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') diff --git a/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD index 18de66776..9f13285b4 100644 --- a/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD +++ b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD @@ -69,6 +69,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '3c219ddfb619b6df903cac4cc42c611d' '7ae3e426251ae33e73dbad71f9c91378' 'dc7550e659ddd685bd78a930d15a01f2' + '39f80ba6bcda6b010a66f9c61e9a0017' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -219,7 +220,7 @@ package() { # Fix libc.so to find correct libraries if ${BOOTSTRAPING}; then sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libc.so - sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libpthreads.so + sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libpthread.so fi install -dm755 ${pkgdir}${_sysroot}/etc/rc.d @@ -240,15 +241,6 @@ package() { ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}${_sysroot}/etc/locale.gen sed -i "s|^|#|g" ${pkgdir}${_sysroot}/etc/locale.gen - if [[ ${CARCH} = "x86_64" ]]; then - # fix for the linker - sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}${_sysroot}/bin/ldd - # Comply with multilib binaries, they look for the linker in /lib64 - mkdir ${pkgdir}${_sysroot}/lib64 - cd ${pkgdir}${_sysroot}/lib64 - ln -v -s ../lib/ld* . - fi - # Do not strip the following files for improved debugging support # ("improved" as in not breaking gdb and valgrind...): # ld-${pkgver}.so @@ -274,36 +266,3 @@ package() { # lib/{libmemusage,libpcprofile,libSegFault}.so \ # usr/lib/{pt_chown,{audit,gconv}/*.so} } -md5sums=('6ffdf5832192b92f98bdd125317c0dfc' - '98d028ee63fca2821414ebcac0af0e5b' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'b042647ea7d6f22ad319e12e796bd13e' - '6970bcfeb3bf88913436d5112d16f588' - '7da8c554a3b591c7401d7023b1928afc' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - '3c219ddfb619b6df903cac4cc42c611d' - '7ae3e426251ae33e73dbad71f9c91378' - 'dc7550e659ddd685bd78a930d15a01f2' - 'b587ee3a70c9b3713099295609afde49' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') -md5sums=('6ffdf5832192b92f98bdd125317c0dfc' - '98d028ee63fca2821414ebcac0af0e5b' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'b042647ea7d6f22ad319e12e796bd13e' - '6970bcfeb3bf88913436d5112d16f588' - '7da8c554a3b591c7401d7023b1928afc' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - '3c219ddfb619b6df903cac4cc42c611d' - '7ae3e426251ae33e73dbad71f9c91378' - 'dc7550e659ddd685bd78a930d15a01f2' - '39f80ba6bcda6b010a66f9c61e9a0017' - 'b587ee3a70c9b3713099295609afde49' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') -- cgit v1.2.3-54-g00ecf From b519b77cd105af5c036a56d7849354f62b32d5db Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 18 Mar 2012 18:27:23 +0100 Subject: Update build order. --- cross/README | 1 + 1 file changed, 1 insertion(+) diff --git a/cross/README b/cross/README index 004f01114..a77b1eb5c 100644 --- a/cross/README +++ b/cross/README @@ -7,6 +7,7 @@ * cross-$target-gcc-core-shared * $target-glibc * $target-gcc +* $target-glibc with BOOTSTRAPING=false cross-* packages are used to bootstrap the full toolchain for the first time, you'll only need binutils, linux-api-headers, glibc and gcc once you're done. -- cgit v1.2.3-54-g00ecf From 52dee61c6240f640f127485a545fc42aa05021a8 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 18 Mar 2012 20:50:45 -0300 Subject: libre/sdl-libre --- libre/sdl-libre/PKGBUILD | 28 +++++++++++++--------------- libre/sdl-libre/sdl-1.2.14-disable-mmx.patch | 13 +++++++++++++ 2 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 libre/sdl-libre/sdl-1.2.14-disable-mmx.patch diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index 20f6ece4b..ffc0ec5f4 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -1,11 +1,12 @@ # $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $ #mips64el Maintainer: Allan McRae # Contributor: dorphell -# Maintainer: Henry Jensen +# Maintainer (Connochaetos): Henry Jensen +# Maintainer (Parabola): André Silva pkgname=sdl-libre -pkgver=1.2.14 -pkgrel=7.1 +pkgver=1.2.15 +pkgrel=1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64') url="http://www.libsdl.org" @@ -13,32 +14,29 @@ license=('LGPL') provides=("sdl=${pkgver}") conflicts=('sdl') depends=('glibc' 'libxext' 'libxrender' 'libx11') -makedepends=('alsa-lib' 'mesa') +makedepends=('alsa-lib' 'mesa' 'libpulse') replaces=('sdl') options=('!libtool') -source=(http://repo.parabolagnulinux.org/other/SDL-${pkgver}-libre.tar.gz - sdl-1.2.14-joystick-crash.diff +source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-fix-disappearing-cursor.patch + sdl-1.2.14-disable-mmx.patch no-riva-accel.patch) -md5sums=('b8ac7254fe5425a0fb238fb535d3d14c' - '9d8890b3817736a5d365f7497f096634' +md5sums=('9d96df8417572a2afb781a7c4c811a85' '04d8c179f125e04bcd4c9d60e013c2d7' - 'a6cf3e71b653aa97d0d8ae6c0a789807' + 'e5c16b7611f62c7cb25f0534eff68852' 'eb2f5899db608ad27b379faa5e0beb80') build() { - cd ${srcdir}/SDL-${pkgver}-libre - patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff + cd ${srcdir}/SDL-${pkgver} patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch + patch -Np1 -i $srcdir/sdl-1.2.14-disable-mmx.patch patch -Np0 -i $srcdir/no-riva-accel.patch ./configure --prefix=/usr --disable-nasm --enable-alsa --enable-esd \ - --with-x --disable-rpath + --with-x --disable-rpath --disable-static make } package() { - cd ${srcdir}/SDL-${pkgver}-libre + cd ${srcdir}/SDL-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch new file mode 100644 index 000000000..1bb6e0e47 --- /dev/null +++ b/libre/sdl-libre/sdl-1.2.14-disable-mmx.patch @@ -0,0 +1,13 @@ +# and another one from FS#26020 + +--- a/src/video/SDL_yuv_sw.c 2009-10-13 06:07:15.000000000 +0700 ++++ b/src/video/SDL_yuv_sw.c 2011-09-20 19:26:30.247742620 +0700 +@@ -89,6 +89,8 @@ + #include "SDL_yuvfuncs.h" + #include "SDL_yuv_sw_c.h" + ++#undef __OPTIMIZE__ ++ + /* The functions used to manipulate software video overlays */ + static struct private_yuvhwfuncs sw_yuvfuncs = { + SDL_LockYUV_SW, -- cgit v1.2.3-54-g00ecf