Travis Willard
fc7f570aad
Added support for makepkg's PKGDEST and SRCDEST params.
...
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-23 16:11:37 -06:00
Travis Willard
5eb176f471
Renamed -c option to -r (for "root") and added -c option (for clean).
...
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-23 16:11:37 -06:00
Aaron Griffin
59d373a62b
Use full filename for scp upload
...
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>
2008-01-23 16:11:37 -06:00
Aaron Griffin
bc8a791ad6
Copy resolv.conf each time just like mtab
...
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-28 22:18:26 -06:00
Aaron Griffin
4a829ff1f7
Force symlink creation in the install target
...
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-28 21:44:11 -06:00
Aaron Griffin
5472d5ab5a
Fixed a typo (mkarchchroot -> mkarchroot)
...
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-11-28 21:28:29 -06:00
Dan McGee
f05495dfc8
Whitespace fixes/cleanup to all of the scripts
...
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-28 21:20:24 -06:00
Aaron Griffin
c229a696a2
Add finddeps script from cvs-arch
...
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-11-28 21:00:07 -06:00
Aaron Griffin
e77986fc08
Add lddd script from cvs-arch
...
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-11-28 21:00:07 -06:00
Dan McGee
f7ab112f9a
Use user's locale.gen instead of sed-magic
...
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-28 14:44:59 -06:00
Dan McGee
0986936143
Allow user to see invalid chrootpath in error message
...
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-11-28 13:06:51 -06:00
Dan McGee
e23b176f3e
Fix some bashisms (but change #! to /bin/bash)
...
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-28 09:10:41 -06:00
Armin Luntzer
f92e01ed28
makechrootpkg: clarify usage message
...
Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-27 16:45:28 -08:00
Armin Luntzer
ceb84394f9
makechrootpkg: Check if build was successful. Copy package to cwd and cleanup $chrootdir/rw/build on success, keep directory contents on failure.
...
Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-27 16:45:28 -08:00
Armin Luntzer
e71c9784b5
mkarchroot: create $working_dir/etc (fixes error msg when trying to copy /etc/mtab during chroot creation)
...
Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-27 16:45:28 -08:00
Armin Luntzer
e16136b8e8
mkarchroot: copy /etc/resolv.conf to chroot
...
Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-27 16:45:28 -08:00
Armin Luntzer
9e660ee86e
mkarchroot: add -M switch for a custom makepkg.conf
...
Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-27 16:45:28 -08:00
Dan McGee
06a0d18bdc
Add an uninstall target
...
Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-11-27 18:15:00 -06:00
Dan McGee
84f29cd824
Clarify message when PKGBUILD does not exist and always have help available
...
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-27 18:14:42 -06:00
Jason Chu
e32a2bb70c
Make sure that build is owned by nobody, so that it can write to the directory
2007-11-04 15:44:53 -08:00
Jason Chu
974d8d11a6
Pass $MAKEPKG_ARGS as separate parameters to makepkg instead of one big string
2007-11-04 15:05:07 -08:00
Jason Chu
64ff97a171
Call mkarchroot not ./mkarchroot so that we can use makechrootpkg from any directory
2007-11-04 15:04:36 -08:00
Jason Chu
39aad4fe59
Escape the uniondir directory reference when creating $uniondir/etc/sudoers and set it to the proper permissions (440)
2007-11-04 15:02:55 -08:00
Jason Chu
411c07f2fb
Copy the install file into the build directory because we need that too
2007-11-04 15:02:03 -08:00
Jason Chu
1e1e1e481e
Accept options to makepkg after a -- so that we can accept longopts for makepkg and even options that are used by makechrootpkg
2007-11-04 15:01:22 -08:00
Jason Chu
bced48cecd
Allow optional params to makechrootpkg (to actually accept extra makepkg args)
2007-11-04 14:56:43 -08:00
Jason Chu
e782cbd00b
Copy mtab over to chroot so that pacman can detect disk space
2007-11-04 14:55:42 -08:00
Jason Chu
3ce2983ad6
Pass $RUN to chroot so that all the params are expanded properly
2007-11-04 14:55:02 -08:00
Jason Chu
b528eba028
Install the custom pacman.conf in the chroot so that it can be used for later updates
2007-11-03 09:57:26 -07:00
Daniel Isenmann
7bb2c48c8f
add -C option to mkarchroot
...
Signed-off-by: Jason Chu <jchu@xentac.net>
2007-11-03 09:40:18 -07:00
Dan McGee
376e23156b
Update makefile for new chroot tools
...
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-29 21:31:16 -05:00
Dan McGee
a6863ff7cb
mkarchroot: move check for root below option parsing
...
This way people can at least see the usage instructions.
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-29 21:31:16 -05:00
Dan McGee
67dc59299a
mkarchroot: clean up/unify output messages
...
Also remove an extra EUID check, we do this at the beginning.
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-29 21:31:16 -05:00
Jason Chu
a104988329
Trap normal exit for makechrootpkg
...
Make sure we umount everything on a clean exit too
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-29 21:09:06 -05:00
Jason Chu
26fc26adf8
Make sure that var/lib/pacman is created
...
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-23 23:51:15 -05:00
Aaron Griffin
a26b93d779
Added 'update' to mkarchroot
...
Allows automated updating of a chroot
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-23 23:50:39 -05:00
Aaron Griffin
0b7d43615b
Added GPL headers
...
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-21 21:08:55 -05:00
Aaron Griffin
34ee028d04
Allow us to properly drop permissions in the chroot via sudo
...
Use sudo to drop permissions and build as "nobody" in the chroot
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-07 12:31:22 -05:00
Aaron Griffin
a336e5a91c
Generate current locale in new chroots by default
...
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>
2007-10-07 12:30:30 -05:00
Simo Leone
192b24f829
Trap EXIT and use relative cache and db paths
...
Trapping exit ensures that unmounting occurs in the event of an exit 1
or a normal exit. Pacman 3.0.6 takes cachedir and dbpath to be relative
to it's given root, not absolute.
Signed-off-by: Simo Leone <simo@archlinux.org>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-06 21:58:16 -05:00
Aaron Griffin
656a54014b
Initial checking of makechrootpkg
...
Mostly functional, missing true su capability....
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-03 23:24:29 -05:00
Aaron Griffin
5c11e9bb7c
Initial mkarchroot commit
...
A simple utility for build and running within archlinux
specific chroot environments
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-03 22:19:03 -05:00
Thomas Bächler
0ccd823361
fixed integrity check when using PKGDEST
...
fixed tab/space indentation
2007-10-03 21:45:28 +02:00
Dan McGee
c42e37bd60
extrapkg: Allow scp limit option to be passed on to scp
...
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-01 23:29:58 -05:00
Dan McGee
43820a5a0d
checkpkg: chmod +x
...
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-01 23:29:12 -05:00
Aaron Griffin
c1efcc1204
Sync package name checking for PKGDEST support
...
Not many changes here, most were already existing
checkpkg should fully support PKGDEST
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-01 23:08:29 -05:00
Thomas Bächler
da6795515b
Integrity check on upload
...
Ths is a little patch to check the integrity of the uploaded file after
uploading it. It will avoid problems like the ones with kernel26 or
openoffice-base recently.
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2007-10-01 23:02:55 -05:00
Dan McGee
05d0bb6fcc
Updates for makepkg3 and current -> core change
...
Taken from makepkg3.patch that was in the PKGBUILD tree.
Signed-off-by: Dan McGee <dan@archlinux.org>
2007-10-01 23:06:38 -05:00
Jason Chu
d7e3a3ed63
made the repo variable point to the right place for currentpkg
...
git-svn-id: http://projects.xennet.org/archtools/devtools/trunk@221 630f3fb4-fbd1-0310-a574-b293cca3120f
2006-04-28 02:42:23 +00:00
Jason Chu
9cc25b8cd4
look for packages in the PKGDEST directory if we can't find them locally
...
git-svn-id: http://projects.xennet.org/archtools/devtools/trunk@219 630f3fb4-fbd1-0310-a574-b293cca3120f
2006-03-20 02:48:43 +00:00