Age | Commit message (Collapse) | Author |
|
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>
|
|
No longer needed in pacman 3.1
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>
|
|
Make the call to scp use $(basename $pkgfile) so that we don't get oddness.
Signed-off-by: Travis Willard <travis@archlinux.org>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This keeps the pkgurl variable consistently fully-qualified, so that whenever we
use that variable we know it points straight at the package file.
Signed-off-by: Travis Willard <travis@archlinux.org>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Now, checkpkg and extrapkg will fail if /etc/makepkg.conf doesn't exist, and will also try to load in personal user's settings in ~/.makepkg.conf
Signed-off-by: Travis Willard <travis@archlinux.org>
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>
|
|
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>
|
|
Fix an issue where a missing add directory causes the package to be uploaded as
a file named "add"
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Resolv.conf changes, like mtab, so we can't just trust it to copy on build only
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Allows us to run 'make install' even if the symlinks exist (helpful for testing
locally)
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
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>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
The sed-magic was wrong in many cases, including my default locale:
LANG=en_US.utf8
locale.gen line: en_US.UTF-8
If we copy the user's locale.gen file, we will generate all of their locales
instead of just the current one.
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
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>
|
|
Signed-off-by: Jason Chu <jchu@xentac.net>
|
|
cleanup $chrootdir/rw/build on success, keep directory contents on failure.
Signed-off-by: Jason Chu <jchu@xentac.net>
|
|
/etc/mtab during chroot creation)
Signed-off-by: Jason Chu <jchu@xentac.net>
|
|
Signed-off-by: Jason Chu <jchu@xentac.net>
|
|
Signed-off-by: Jason Chu <jchu@xentac.net>
|
|
Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
makechrootpkg should check for a PKGBUILD and user credentials after the
option to print usage is granted.
Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
|
|
|
|
directory
|
|
and set it to the proper permissions (440)
|
|
|
|
makepkg and even options that are used by makechrootpkg
|
|
|
|
|
|
|
|
later updates
|
|
Signed-off-by: Jason Chu <jchu@xentac.net>
|
|
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
This way people can at least see the usage instructions.
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
Also remove an extra EUID check, we do this at the beginning.
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
Make sure we umount everything on a clean exit too
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Allows automated updating of a chroot
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Use sudo to drop permissions and build as "nobody" in the chroot
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This is a slightly hackish way of auto-filling locale information based on the
locale at the time of chroot building.
Further locale changes must be done manually.
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|