summaryrefslogtreecommitdiff
path: root/makechrootpkg
AgeCommit message (Collapse)Author
2009-09-18Attempted fix for SRCDEST/PKGDEST parsingAaron Griffin
- Do *not* overwrite the makepkg.conf in the chroot - Source global makepkg configs for SRCDEST and PKGDEST Original commit 4bc819a20e4029a53d97cfa3cff164b3a497f7fe by Evangelos Foutras <foutrelis@gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-18Remove some extra cleanup umountsAaron Griffin
Leftovers from when we used to bind-mount PKGDEST and SRCDEST Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-18Revert "Don't copy makepkg.conf into the chroot"Aaron Griffin
This reverts commit 4bc819a20e4029a53d97cfa3cff164b3a497f7fe. Temporary revert until we get this sorted out Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-18Fix indentationFrancois Charette
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-09-01makechrootpkg: fixed copying of .install files to chroot for split packagesAllan McRae
Patch-by: Eric Bélanger <eric@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
2009-08-18Don't copy makepkg.conf into the chrootEvangelos Foutras
Replacing the chroot's makepkg.conf with our own prevents us from building i686 packages in a i686 chroot on a x86_64 host. [Aaron: Plus additional whitespace edits] Signed-off-by: Evangelos Foutras <foutrelis@gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-08-18makechrootpkg: Remove some extra packagesEric Bélanger
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-08-12Replace '>/dev/null 2>&1' with '&>/dev/null'Aaron Griffin
Original-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-08-12Fix namcap errors and add PKGBUILDEric Bélanger
[Aaron: swapped 2>&1 >/dev/null to >/dev/null 2>&1 to fix this better] Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-08-12makechrootpkg: Support for split packagesEric Bélanger
Move all built packages in the PKGDEST or WORKDIR (pkgname is now an array). Additional fixes for * inside quotes Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-08-06fix copy the install files on split packages.Biru Ionut
Signed-off-by: Biru Ionut <ionut@archlinux.ro> [Aaron: Changed backtick syntax and added some quoting] Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-06-30makechrootpkg: namcap path fixBiru Ionut
Run namcap on the full path including /pkgdest/ Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-06-12Cause chroot buildscript to exit with errorAaron Griffin
If a build fails, exit the script with an error. This also prevents namcap from being called if there is no build package Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-05-13Use $PKGEXT defined in makepkg.confPierre Schmitz
Also replace some uses of tar with bsdtar Signed-off-by: Pierre Schmitz <pierre@archlinux.de> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-05-06Replace unionfs with aufsAaron Griffin
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-05-06Cleanup some of the DB addition codeAaron Griffin
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-03-09makechrootpkg: remove 'local' keywordAaron Griffin
Whoops. Not valid outside a function Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-03-09makechrootpkg: remove (pkg|src)dest mount checkAaron Griffin
This is no longer needed as we don't mount-bind PKGDEST or SRCDEST Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-03-09makechrootpkg: Don't fail if no chroot namcapAaron Griffin
The call to namcap was causing the script to fail if namcap didn't exist or returned 1. Fix that by always returning 0... Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-03-09makechrootpkg: Don't mount-bind srcdest/pkgdestAaron Griffin
Do actual copying to and from PKGDEST and SRCDEST rather than mounting via --bind, as the chown and other operations can cause issues here Original-work-by: Phil Dillon-Thiselton <dibblethewrecker@gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-02-26makechrootpkg: Check for files before copyingAaron Griffin
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-02-26makechrootpkg: Allow setting rw layer dir nameAaron Griffin
Make the name of the rw layer (default <chrootdir>/rw) configurable with a command line switch. Useful for maintaining multipl chroots on top of a clean base. i.e. <chrootdir>/root #clean chroot <chrootdir>/rw #default RW layer <chrootdir>/gnome #a RW layer with all of gnome installed <chrootdir>/kde #a RW layer with all of KDE installed Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-02-25Check mkarchroot's return codeAaron Griffin
We weren't doing this before, and after build steps were being run even if the build failed or if the user cancelled the build Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-02-24makechrootpkg: Use --noconfirm when updatingAaron Griffin
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-02-24makechrootpkg: Add -d to add to local repoAaron Griffin
When a package build is complete, it is automatically added to a local db in <chrootdir>/rw/repo/ Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-02-24makechrootpkg: Remove $CHROOT_SHELL env varAaron Griffin
This was kinda useless and complicated. We'll just force -r usage Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-02-23Change makechrootpkg -i arg to -IAaron Griffin
This way we don't conflict with makepkg's -i, which could be useful to us Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-02-23Add 'update first' flag and fix helpAaron Griffin
Add -u to update the chroot before building. This should update the unionfs rw layer only, leaving the chroot clean. Useful for rebuilds and a local repo. Also fix the docs and document the -i flag Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-01-31makechrootpkg - understand makepkg source syntaxAllan McRae
The source line in a PKGBUILD can have a structure like source=(´filename::url´). Signed-off-by: Allan McRae <allan@archlinux.org>
2008-04-21Allow makechrootpkg to install package files in the chrootAaron Griffin
This is a very very hackish way to deal with rebuilds for right now. The intent is the following: First build foobar-1.2 makechrootpkg -i foobar-1.2-1-i686.pkg.tar.gz Now build packages that depend on foobar-1.2 Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-04-21makechrootpkg: Always attempt to move pkg/srcAaron Griffin
Sometimes makepkg fails, but a package is built - for instance, when makepkg cannot remove deps. In this case we will attempt to move the pkg/src files regardless. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-04-14Copy ChangeLog into chroot too.Travis Willard
Signed-off-by: Travis Willard <travis@archlinux.org> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-04-14Temporary workaround for unionfs issuesAaron Griffin
The latest incarnations of unionfs have issues appending text via shell redirection, so to work around it, we can touch the file before-hand to move it to the RW portion of the union. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-03-17Set $HOME before dropping permissionsAaron Griffin
Because we need a root user to chroot, when we drop permissions to 'nobody', we're still using HOME=/root Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-02-07Correcting an error in e0f139ad0e2b4144c39fa4431d174f453eb0ca520.5.1Simo Leone
If only you could have seen the facepalming going on... Signed-off-by: Simo Leone <simo@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-06Change unionfs module loading0.5Simo Leone
Checking /proc/filesystems for unionfs is friendlier for kernels with unionfs builtin. Also, a total lack of unionfs now causes makechrootpkg to bail out. Signed-off-by: Simo Leone <simo@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-29Add -r to the default makepkg argsAaron Griffin
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Minor pathing cleanupsAaron Griffin
Reported-by: Jaroslaw Swierczynski <swiergot@juvepoland.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Check for existing files when copying to chrootAaron Griffin
Use basename when checking for files in the source array This allows us to actually check for pre-downloaded remote files and copy them to the build root as well. Original-work-by: Jaroslaw Swierczynski <swiergot@juvepoland.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Remove "use sudo" from default makechrootpkg makepkg argsAaron Griffin
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Don't clear build dir upon completionAaron Griffin
Clear when creating the dir, and additionally DO not clear it if the user is attempting to repack the package. Original-work-by: Jaroslaw Swierczynski <swiergot@juvepoland.com> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Fix getopts bug and be more specific when moving package file.Travis Willard
My recent commit adding the -c option and renaming the old -c to -r accidentally left out the new '-r' option from the getopts call. Additionally, add ${pkgrel} to the mv line after building to be more specific about that file to move. Signed-off-by: Travis Willard <travis@archlinux.org> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Copy makepkg.conf and ~/.makepkg.conf into chroot.Travis Willard
This change allows all packager-defined settings (such as PACKAGER or OPTIONS) to propogate into the chroot when building packages. Signed-off-by: Travis Willard <travis@archlinux.org> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Added support for makepkg's PKGDEST and SRCDEST params.Travis Willard
This ensures that sources and packages built inside makechrootpkg go where the user expects them to, as defined in their /etc/makepkg.conf and ~/.makepkg.conf files. Signed-off-by: Travis Willard <travis@archlinux.org> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Renamed -c option to -r (for "root") and added -c option (for clean).Travis Willard
The old -c option, which specified a 'chroot', has been renamed to -r, since most other scripts use -r for a different root. A new -c option is introduced, which cleans all files from ${chrootdir}/rw before beginning, thus ensuring a clean chroot. Signed-off-by: Travis Willard <travis@archlinux.org> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-11-28Whitespace fixes/cleanup to all of the scriptsDan McGee
Add the same vim modeline to all the files, as well as cleanup the newly added scripts a bit. If you look at this diff with the -w option, you'll see it really isn't all that significant. Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-28Allow user to see invalid chrootpath in error messageDan McGee
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-28Fix some bashisms (but change #! to /bin/bash)Dan McGee
We need to use bash due to the usage of arrays, but we might as well fix some bashisms that were used in the scripts anyways. Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-27makechrootpkg: clarify usage messageArmin Luntzer
Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-27makechrootpkg: Check if build was successful. Copy package to cwd and ↵Armin Luntzer
cleanup $chrootdir/rw/build on success, keep directory contents on failure. Signed-off-by: Jason Chu <jchu@xentac.net>