Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c38daa17afe832067c656bc76b0518b25dde7dcb
commit c38daa17afe832067c656bc76b0518b25dde7dcb Author: James Buren <r...@frugalware.org> Date: Wed Nov 9 18:52:02 2011 -0600 fw32-0.8.2-1-x86_64 * version bump * extend install script * now has repoman integration * now has FPM install support * now tries to automatically update the chroot with changes to fw32 core * select system directories are now binded read only diff --git a/source/fw32-extra/fw32/FrugalBuild b/source/fw32-extra/fw32/FrugalBuild index 120014db..d63ca89 100644 --- a/source/fw32-extra/fw32/FrugalBuild +++ b/source/fw32-extra/fw32/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: James Buren <r...@frugalware.org> pkgname=fw32 -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=1 pkgdesc="A framework for maintaining an i686 environment on x86_64." url="http://www.frugalware.org"; @@ -12,7 +12,6 @@ archs=('!i686' 'x86_64' '!ppc' '!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) -sha1sums=('b6ff9249b7f29aa3198be46042164f611287dc45') -_F_cd_path="." +sha1sums=('832542b83ca54cc27f157ed68fd685310468326a') # optimization OK diff --git a/source/fw32-extra/fw32/README.Frugalware b/source/fw32-extra/fw32/README.Frugalware index fd17bca..8a4eb35 100644 --- a/source/fw32-extra/fw32/README.Frugalware +++ b/source/fw32-extra/fw32/README.Frugalware @@ -10,7 +10,7 @@ fw32-create systemctl enable fw32.service (required for boot-time fw32 root mounting) ---- -=== Updating chroot +=== Upgrading chroot This needs to be done when packages become out of date. Command to use (with sudo or root shell): @@ -19,7 +19,7 @@ Command to use (with sudo or root shell): fw32-upgrade ---- -WARNING: Should not be done while someone is using the chroot. +WARNING: Should not be used while someone is using the chroot. === Installing packages or groups to chroot @@ -29,7 +29,7 @@ Command to use (with sudo or root shell): fw32-install <packages and/or groups> ---- -WARNING: Should not be done while someone is using the chroot. +WARNING: Should not be used while someone is using the chroot. === Removing packages or groups from chroot @@ -39,7 +39,27 @@ Command to use (with sudo or root shell): fw32-remove <packages> ---- -WARNING: Should not be done while someone is using the chroot. +WARNING: Should not be used while someone is using the chroot. + +=== Installing local FPM package to chroot + +Command to use (with sudo or root shell): + +---- +fw32-install-package <FPM packages> +---- + +WARNING: Should not be used while someone is using the chroot. + +=== Installing nobuild package to chroot + +Command to use (with sudo or root shell): + +---- +fw32-merge <package> +---- + +WARNING: Should not be used while someone is using the chroot. === Cleaning chroot cache @@ -49,7 +69,7 @@ Command to use (with sudo or root shell): fw32-clean ---- -WARNING: Should not be done while someone is using the chroot. +WARNING: Should not be used while someone is using the chroot. === Deleting chroot @@ -59,7 +79,7 @@ Command to use (with sudo or root shell): fw32-delete ---- -WARNING: Should not be done while someone is using the chroot. +WARNING: Should not be used while someone is using the chroot. === Removing fw32 @@ -72,7 +92,7 @@ rm -f /var/cache/pacman-g2/pkg/*i686.fpm (only needed if you want to delete the pacman-g2 -R fw32 ---- -WARNING: Should not be done while someone is using the chroot. +WARNING: Should not be used while someone is using the chroot. === Running a command within the chroot @@ -106,6 +126,14 @@ WARNING: Should not be used while someone is using the chroot. WARNING: Should not be used while someone is using the chroot. +- fw32-install-package: Install all i686 FPMs specified to chroot. + +WARNING: Should not be used while someone is using the chroot. + +- fw32-merge: Install a nobuild package to chroot. + +WARNING: Should not be used while someone is using the chroot. + - fw32-mount-all: Manually mount the chroot base directories. - fw32-run: Run a command within the chroot. If no command is specified, @@ -129,4 +157,5 @@ Some `nobuild` packages (like Skype) are available on x86_64, even if upstream provides an i686 binary only. In that case the package has to be installed inside the i686 chroot and on the host system as well: the host package will contain a desktop file and an icon only to invoke the -chrooted package. +chrooted package. See the fw32-merge command for details on how to install +the i686 version. diff --git a/source/fw32-extra/fw32/fw32.install b/source/fw32-extra/fw32/fw32.install index eb0e38b..e212683 100644 --- a/source/fw32-extra/fw32/fw32.install +++ b/source/fw32-extra/fw32/fw32.install @@ -1,6 +1,8 @@ post_upgrade() { + [ "$1" == "$2" ] && return systemctl daemon-reload &> /dev/null + fw32-update &> /dev/null } post_remove() _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
