summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2008-02-07Add architecture-specific logic into extrapkgDan McGee1-7/+23
This change will remove 4 needless sed lines from the PKGBUILD we use on Arch for building this package and do the logic locally where it probably makes more sense anyway. $CARCH should always be present as we fail if we cannot find a correct makepkg.conf file in /etc/. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-06Change unionfs module loading0.5Simo Leone1-1/+7
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-02-06Separate mounting from config copyingSimo Leone1-1/+6
Copying the configs before installing stuff caused conflicts. Running the host's pacman uses the host's configuration anyway, so there is no need to copy them in this case. 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 Griffin1-1/+1
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Minor pathing cleanupsAaron Griffin1-2/+4
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 Griffin1-2/+3
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 Griffin1-1/+1
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Remove DBPath from mkarchrootAaron Griffin1-1/+0
No longer needed in pacman 3.1 Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Don't clear build dir upon completionAaron Griffin1-0/+14
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-23Ensure scp'ing the package file works when PKGDEST is defined.Travis Willard1-1/+1
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>
2008-01-23Ensure pkgurl is always fully-qualified pathname in checkpkg.Travis Willard1-15/+14
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>
2008-01-23Improve makepkg config loading for checkpkg and extrapkg.Travis Willard2-2/+24
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>
2008-01-23Fix getopts bug and be more specific when moving package file.Travis Willard1-2/+2
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 Willard1-4/+9
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-23Output full path to package in finddepsDamir Perisa1-2/+2
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-01-23Added support for makepkg's PKGDEST and SRCDEST params.Travis Willard1-1/+39
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 Willard1-2/+8
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>
2008-01-23Use full filename for scp uploadAaron Griffin1-1/+1
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>
2007-11-29Copy resolv.conf each time just like mtabAaron Griffin1-3/+3
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>
2007-11-29Force symlink creation in the install targetAaron Griffin1-3/+3
Allows us to run 'make install' even if the symlinks exist (helpful for testing locally) Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-11-29Fixed a typo (mkarchchroot -> mkarchroot)Aaron Griffin1-1/+1
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-11-29Whitespace fixes/cleanup to all of the scriptsDan McGee6-120/+133
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-29Add finddeps script from cvs-archAaron Griffin2-0/+38
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-11-29Add lddd script from cvs-archAaron Griffin2-0/+48
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-11-28Use user's locale.gen instead of sed-magicDan McGee1-1/+1
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>
2007-11-28Allow user to see invalid chrootpath in error messageDan McGee1-1/+1
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-28Fix some bashisms (but change #! to /bin/bash)Dan McGee2-7/+7
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-28makechrootpkg: clarify usage messageArmin Luntzer1-1/+1
Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-28makechrootpkg: Check if build was successful. Copy package to cwd and ↵Armin Luntzer1-3/+12
cleanup $chrootdir/rw/build on success, keep directory contents on failure. Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-28mkarchroot: create $working_dir/etc (fixes error msg when trying to copy ↵Armin Luntzer1-0/+1
/etc/mtab during chroot creation) Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-28mkarchroot: copy /etc/resolv.conf to chrootArmin Luntzer1-0/+2
Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-28mkarchroot: add -M switch for a custom makepkg.confArmin Luntzer1-1/+9
Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-28Add an uninstall targetDan McGee1-0/+10
Signed-off-by: Dan McGee <dan@archlinux.org> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-11-28Clarify message when PKGBUILD does not exist and always have help availableDan McGee1-11/+11
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>
2007-11-05Make sure that build is owned by nobody, so that it can write to the directoryJason Chu1-0/+1
2007-11-05Pass $MAKEPKG_ARGS as separate parameters to makepkg instead of one big stringJason Chu1-1/+1
2007-11-05Call mkarchroot not ./mkarchroot so that we can use makechrootpkg from any ↵Jason Chu1-1/+1
directory
2007-11-05Escape the uniondir directory reference when creating $uniondir/etc/sudoers ↵Jason Chu1-1/+2
and set it to the proper permissions (440)
2007-11-05Copy the install file into the build directory because we need that tooJason Chu1-0/+3
2007-11-05Accept options to makepkg after a -- so that we can accept longopts for ↵Jason Chu1-1/+7
makepkg and even options that are used by makechrootpkg
2007-11-04Allow optional params to makechrootpkg (to actually accept extra makepkg args)Jason Chu1-1/+1
2007-11-04Copy mtab over to chroot so that pacman can detect disk spaceJason Chu1-0/+3
2007-11-04Pass $RUN to chroot so that all the params are expanded properlyJason Chu1-1/+1
2007-11-03Install the custom pacman.conf in the chroot so that it can be used for ↵Jason Chu1-0/+5
later updates
2007-11-03add -C option to mkarchrootDaniel Isenmann1-1/+6
Signed-off-by: Jason Chu <jchu@xentac.net>
2007-10-30Update makefile for new chroot tools0.4Dan McGee1-1/+5
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-30mkarchroot: move check for root below option parsingDan McGee1-5/+6
This way people can at least see the usage instructions. Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-30mkarchroot: clean up/unify output messagesDan McGee1-18/+14
Also remove an extra EUID check, we do this at the beginning. Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-30Trap normal exit for makechrootpkgJason Chu1-1/+1
Make sure we umount everything on a clean exit too Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-24Make sure that var/lib/pacman is createdJason Chu1-1/+1
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>