Age | Commit message (Collapse) | Author |
|
Move this inside the split packages loop
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This patch fixed copying of packages with splitting (FS#16181)
It also adds missing quotes around chrootdir variable.
Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
- 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>
|
|
Leftovers from when we used to bind-mount PKGDEST and SRCDEST
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This reverts commit 4bc819a20e4029a53d97cfa3cff164b3a497f7fe.
Temporary revert until we get this sorted out
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Patch-by: Eric Bélanger <eric@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
|
|
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>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Original-by: Eric Bélanger <snowmaniscool@gmail.com>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
[Aaron: swapped 2>&1 >/dev/null to >/dev/null 2>&1 to fix this better]
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
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>
|
|
Signed-off-by: Biru Ionut <ionut@archlinux.ro>
[Aaron: Changed backtick syntax and added some quoting]
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Run namcap on the full path including /pkgdest/
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
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>
|
|
Also replace some uses of tar with bsdtar
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Whoops. Not valid outside a function
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This is no longer needed as we don't mount-bind PKGDEST or SRCDEST
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
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>
|
|
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>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
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>
|
|
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>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
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>
|
|
This was kinda useless and complicated. We'll just force
-r usage
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This way we don't conflict with makepkg's -i, which
could be useful to us
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
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>
|
|
The source line in a PKGBUILD can have a structure like
source=(´filename::url´).
Signed-off-by: Allan McRae <allan@archlinux.org>
|
|
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>
|
|
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>
|
|
Signed-off-by: Travis Willard <travis@archlinux.org>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Reported-by: Jaroslaw Swierczynski <swiergot@juvepoland.com>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
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>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|