Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=b642fdaa3400eb3ac17008cb25ff52db4c6b0d00
commit b642fdaa3400eb3ac17008cb25ff52db4c6b0d00 Author: James Buren <[email protected]> Date: Sun Aug 5 14:23:46 2012 -0500 fw32-0.9.0-1-x86_64 * version bump diff --git a/source/fw32-extra/fw32/FrugalBuild b/source/fw32-extra/fw32/FrugalBuild index b13f3b6..d9bdc1c 100644 --- a/source/fw32-extra/fw32/FrugalBuild +++ b/source/fw32-extra/fw32/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: James Buren <[email protected]> pkgname=fw32 -pkgver=0.8.9 -pkgrel=4 +pkgver=0.9.0 +pkgrel=1 pkgdesc="A framework for maintaining an i686 environment on x86_64." url="http://www.frugalware.org"; depends=('glibc' 'pacman-g2') @@ -11,9 +11,8 @@ groups=('fw32-extra') archs=('!i686' 'x86_64' '!arm') up2date="Flasttar http://ftp.frugalware.org/pub/other/$pkgname"; backup=('etc/fw32/pacman-g2.conf') -source=(http://ftp.frugalware.org/pub/other/$pkgname/$pkgname-$pkgver.tar.xz git.patch) -sha1sums=('8fb725232342f35617f30559030b8e5743807a93' \ - 'c836e9157e3ffa2bc6eb5c9ff81c23a2a01bec51') +source=(http://ftp.frugalware.org/pub/other/$pkgname/$pkgname-$pkgver.tar.xz) +sha1sums=('2d9fc3c31ef9f7c9b8d607f69be323e6456635e8') _F_systemd_scriptlet="$pkgname.install" _F_systemd_units=(fw32=) Finclude systemd diff --git a/source/fw32-extra/fw32/README.Frugalware b/source/fw32-extra/fw32/README.Frugalware index 8a4eb35..30f37f3 100644 --- a/source/fw32-extra/fw32/README.Frugalware +++ b/source/fw32-extra/fw32/README.Frugalware @@ -151,6 +151,11 @@ WARNING: Should not be used while someone is using the chroot. WARNING: Should not be used while someone is using the chroot. +=== building i686 packages +Use the command `fw32-makepkg` as root, in the same way you would use +regular makepkg. It will transparently wrap your build into a i686 +chroot to produce a i686 package. + === nobuild packages Some `nobuild` packages (like Skype) are available on x86_64, even if diff --git a/source/fw32-extra/fw32/git.patch b/source/fw32-extra/fw32/git.patch deleted file mode 100644 index a285e16..0000000 --- a/source/fw32-extra/fw32/git.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/fw32.c b/fw32.c -index 6b45bcb..20f914c 100644 ---- a/fw32.c -+++ b/fw32.c -@@ -270,7 +270,7 @@ ismounted(const char *path) - - *e = 0; - -- char *ptr = strstr(s,"\\040"); -+ char *ptr = strstr(s,"\\040(deleted)"); - - if(ptr) - *ptr = 0; -@@ -364,7 +364,7 @@ umount_directory(FW32_DIR *path) - { - assert(path); - -- if(umount2(path->dir,UMOUNT_NOFOLLOW) && (errno != EINVAL || errno != ENOENT)) -+ if(umount2(path->dir,UMOUNT_NOFOLLOW) && errno != EINVAL && errno != ENOENT) - error("Failed to umount directory: %s: %s\n",path->dir,strerror(errno)); - } - -@@ -414,10 +414,10 @@ umount_all(void) - - if(!strncmp(s,FW32_ROOT,strlen(FW32_ROOT))) - { -- char *ptr = strstr(s,"\\040"); -+ char *ptr = strstr(s,"\\040(deleted)"); - if(ptr) - *ptr = 0; -- if(fwrite(s,1,e-s,out) != e-s || fwrite("\n",1,1,out) != 1 || fflush(out)) -+ if(fprintf(out,"%s\n",s) < 0 || fflush(out)) - error("Failed to write to memory stream.\n"); - } - } -diff --git a/pacman-g2.conf b/pacman-g2.conf -index 464aad5..a53203f 100644 ---- a/pacman-g2.conf -+++ b/pacman-g2.conf -@@ -1,5 +1,5 @@ - [options] - LogFile=/var/log/pacman-g2.log - --Include = /etc/pacman-g2/repos/current_i686 --#Include = /etc/pacman-g2/repos/stable_i686 -+[frugalware-current] -+Server = http://www10.frugalware.org/pub/linux/frugalware/frugalware-current/frugalware-i686 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
