Allan McRae wrote:
Allan McRae wrote:
Dan McGee wrote:
On Thu, Apr 16, 2009 at 2:59 PM, Aaron Griffin
<[email protected]> wrote:
On Tue, Apr 14, 2009 at 2:29 PM, Aaron Griffin
<[email protected]> wrote:
On Tue, Apr 14, 2009 at 2:10 PM, Eric Bélanger
<[email protected]> wrote:
On Thu, Apr 9, 2009 at 12:01 PM, Aaron Griffin
<[email protected]> wrote:
On Thu, Apr 9, 2009 at 6:39 AM, Allan McRae
<[email protected]> wrote:
Any update for devtools? I'm still using 2.6.29.1-2 as I want to
keep
using my chroots.
If you want to jump ahead:
http://code.phraktured.net/cgit.cgi/devtools/commit/?id=ca87391f99760dc6677df419031108e65b588ecd
The patch is simple, as aufs supports unionfs syntax too. Actually a
sed "s/unionfs/aufs/" should actually work too.
Make sure to install aufs2-util though
Any qualms with me releasing devtools as it is from git?
Yes- it installs a communitypkg script that will no longer work with
the tupkg uploader, as it has been switched to use the devtools and
upload to our other server.
I suppose we can just not distribute that in the package for the time
being. Anyway, I will be taking the git versions of the building
scripts for a spin later today so I can give them a good testing
before you make a release.
Issues I have with makechrootpkg (git master with Aaron's master merged):
1) there is a whole heap of issues with using ""'s around variables
that have *'s in them. So the * is not getting expanded and there are
issues copying the completed packages and adding them to a db. I will
send a patch soon. However the fix stops people using base chroot
directories with spaces in them. I personally don't care about that
possibility and prefer things to work in some form...
2) I get output like:
which: no namcap in
(/home/allan/bin:/home/allan/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/bin/perlbin/site:/usr/bin/perlbin/vendor:/usr/bin/perlbin/core)
because the redirection to /dev/null is not quite right. Again, patch
on its way...
Patch attached. Applies on top of devtools git master with Aaron's
master merged on top.
Allan
>From 049fe9d16a26c9859fda8c089c1014f51275f1da Mon Sep 17 00:00:00 2001
From: Allan McRae <[email protected]>
Date: Fri, 17 Apr 2009 23:32:55 +1000
Subject: [PATCH] makechrootpkg: do not use quotes around variable with globs
The $pkgfile variable had a * glob in it but was used with quotes
which defeated its purpose. This fixes copying the built package
file to its final destination and adding it to a repo.
Also, fix the silencing of namcap output.
Signed-off-by: Allan McRae <[email protected]>
---
makechrootpkg | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/makechrootpkg b/makechrootpkg
index 78601d4..e4a36a7 100755
--- a/makechrootpkg
+++ b/makechrootpkg
@@ -214,7 +214,7 @@ export LANG=$LOCALE
cd /build
export HOME=/build
sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
-which namcap 2>&1 >/dev/null && namcap *.pkg.tar.gz > /pkgdest/namcap.log
+which namcap &> /dev/null && namcap *.pkg.tar.gz > /pkgdest/namcap.log
exit 0
EOF
) > "$uniondir/chrootbuild"
@@ -225,21 +225,21 @@ if mkarchroot -r "/chrootbuild" "$uniondir"; then
pkgfile=${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz
- if [ -n "$add_to_db" -a -e "$pkgfile" ]; then
+ if [ -n "$add_to_db" -a -e $pkgfile ]; then
[ -d "${chrootdir}/union/repo" ] || mkdir -p "${chrootdir}/union/repo"
pushd "${chrootdir}/union/repo" >/dev/null
- cp "$pkgfile" .
- repo-add repo.db.tar.gz "${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz"
+ cp $pkgfile .
+ repo-add repo.db.tar.gz ${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz
popd >/dev/null
fi
- if [ -e "$pkgfile" ]; then
+ if [ -e $pkgfile ]; then
if [ -n "$PKGDEST" ]; then
echo "Moving completed package file to ${PKGDEST}"
- mv "$pkgfile" "${PKGDEST}"
+ mv $pkgfile "${PKGDEST}"
else
echo "Moving completed package file to ${WORKDIR}"
- mv "$pkgfile" "${WORKDIR}"
+ mv $pkgfile "${WORKDIR}"
fi
fi
for f in ${chrootdir}/union/srcdest/*; do
--
1.6.2.3
