Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b23328f16d7111a52577eda84caecc9d14a64ade
commit b23328f16d7111a52577eda84caecc9d14a64ade Author: Marius Cirsta <[email protected]> Date: Sun Apr 5 17:36:48 2015 +0300 pacman-g2-3.9.0-11-x86_64 * add makepkg patch to mount /dev/shm in chroot when building diff --git a/source/base/pacman-g2/FrugalBuild b/source/base/pacman-g2/FrugalBuild index c84fabb..b58119e 100644 --- a/source/base/pacman-g2/FrugalBuild +++ b/source/base/pacman-g2/FrugalBuild @@ -10,7 +10,7 @@ USE_STABLE=${USE_STABLE:-"n"} pkgname=pacman-g2 pkgver=3.9.0 Fuse $USE_DEVEL && pkgver=3.8.1.18.gc254053 -pkgrel=10 +pkgrel=11 pkgdesc="A .tar.xz based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/" backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) @@ -36,8 +36,10 @@ archs=('i686' 'x86_64' 'arm') _F_archive_nosort=y up2date="Flasttar $url/releases/" if ! Fuse $USE_DEVEL; then - source=($url/releases/$pkgname-$pkgver.tar.gz 0001-Revert-libftp-set-SO_-TIMEO-on-sockets-to-avoid-bloc.patch 0001-util-in-_pacman_runhook-close-the-directory-before-r.patch 0001-server-free-the-netbuf-object-before-returning-when-.patch libftp.patch 0001-repos-comment-out-ftp5-mirror-pending-a-resolution-o.patch 0001-repos-comment-out-all-mirrors-that-are-inactive.patch) - signatures=("$source.asc" '' '' '' '' '' '') + source=($url/releases/$pkgname-$pkgver.tar.gz 0001-Revert-libftp-set-SO_-TIMEO-on-sockets-to-avoid-bloc.patch 0001-util-in-_pacman_runhook-close-the-directory-before-r.patch \ + 0001-server-free-the-netbuf-object-before-returning-when-.patch libftp.patch 0001-repos-comment-out-ftp5-mirror-pending-a-resolution-o.patch \ + 0001-repos-comment-out-all-mirrors-that-are-inactive.patch mount_shm.patch) + signatures=("$source.asc" '' '' '' '' '' '' '') if Fuse $USE_STABLE; then source=("${source[@]}" stable.patch) signatures=("${signatures[@]}" '') diff --git a/source/base/pacman-g2/mount_shm.patch b/source/base/pacman-g2/mount_shm.patch new file mode 100644 index 0000000..54839b1 --- /dev/null +++ b/source/base/pacman-g2/mount_shm.patch @@ -0,0 +1,18 @@ +--- pacman-g2-3.9.0/scripts/makepkg 2013-02-18 13:07:02.000000000 +0200 ++++ pacman-g2-3.9.0.new/scripts/makepkg 2015-04-05 17:17:16.000000000 +0300 +@@ -366,6 +366,7 @@ + + chroot_umount() { + msg "Attempting to umount chroot directories..." ++ umount $CHROOTDIR/dev/shm >/dev/null + umount $CHROOTDIR/proc >/dev/null + umount $CHROOTDIR/sys >/dev/null + umount $CHROOTDIR/dev >/dev/null +@@ -383,6 +384,7 @@ + mount -t proc none $CHROOTDIR/proc >/dev/null + mount -t sysfs none $CHROOTDIR/sys >/dev/null + mount -t devtmpfs none $CHROOTDIR/dev >/dev/null ++ mount -o bind /dev/shm $CHROOTDIR/dev/shm + mount -o bind /var/cache/pacman-g2 $CHROOTDIR/var/cache/pacman-g2 >/dev/null + mount -o bind $CCACHE_BASEDIR/$pkgname \ + $CHROOTDIR/var/cache/ccache/$pkgname >/dev/null _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
