summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-01-04Merge branch 'devtools'Luke Shumaker
Conflicts: checkpkg.in lib/common.sh makechrootpkg.in
2013-11-07Prepare release20131107Pierre Schmitz
2013-11-07FS#37656 - [devtools] add SRCPKGDEST to makechrootpkgMarkus M. May
Signed-off-by: Markus M. May <mmay@javafreedom.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-11-07makechrootpkg: Don't copy the logpipeJan Alexander Steffens (heftig)
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-11-04find_cached_package: avoid adding duplicatesDave Reisner
If PKGDEST is set when makepkg was run, the package will be present in find_cached_package's search path by default, causing an error. This also fixes a display bug which causes no output to be shown when multiple packages are found. Fixes FS#37626. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-11-01checkpkg: Fix usage of local mirrors20131101Pierre Schmitz
2013-11-01Prepare releasePierre Schmitz
2013-11-01Add support for building bzr packagesMaxime Gauduin
Fixes FS#36654: https://bugs.archlinux.org/task/36654. Signed-off-by: Maxime Gauduin <alucryd@gmail.com> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-11-01Add mountpoint check to btrfs subvol logicWorMzy Tykashi
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-11-01common: implement find_cached_packageDave Reisner
This function (currently) searches through $PWD and $PKGDEST looking for a tarball matching the requested package name, architecture, and pkgver. If found, it writes the full path to the located package to stdout and returns 0, else 1. If more than 1 match is found, it's treated as an error and the user will need to figure out what to do. Use this in checkpkg and commitpkg, which previously implemented their own less complete logic, to locate the build artifacts they rely on. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-11-01commitpkg: check all files at once for version controlDave Reisner
Instead of dying at the first sight of an unversioned file, this lets commitpkg dump all known unversioned files at once. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-11-01makechrootpkg: Look harder for -R argumentDave Reisner
We shouldn't be in the business of reparsing makepkg's arguments, but since we have to treat the case of repackaging separately, do a better job of trying to find signs of it happening. This change lets you pass the longopt, --repackage, or multiple shortopts such as -RA, and still get the intended effect. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-11-01checkpkg: Only match .so at end of filenames for soname checkEric Bélanger
Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-10-27checkpkg: Fix soname checkEric Bélanger
The bsdtar options were in the incorrect order and objdump couldn't find the files. Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-10-27checkpkg: Create symlinks to old packages in $TEMPDIR instead of $PWDEric Bélanger
Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-10-26Merge branch 'devtools'libretools-20131027Luke Shumaker
2013-10-26arch-nspawn: fix grammar in error message: s/a Arch/an Arch/Luke Shumaker
2013-10-20prepare release20131020Pierre Schmitz
2013-10-20Remove libtool files by defaultPierre Schmitz
2013-10-19Make !staticlibs the default in makepkg.confAllan McRae
Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-10-09This is embarrassing, I messed up the braces on $@ for lock/slocklibretools-20131015Luke Shumaker
2013-09-26Merge branch 'devtools'libretools-20130930Luke Shumaker
2013-09-26arch-nspawn: limit the machine_name length to ${HOST_NAME_MAX:-64} chars.Luke Shumaker
The criteria for a valid name are: - is made of of alphanumerics, "_", ".", and "-" - is not emtpy - cannot end with "." - cannot contain ".." - the maximum length is HOST_NAME_MAX, as defined in <limits.h> The existing code takes care of all but the last of these. So, added code after the existing code to check the length of the string, and grab the longest possible substring from the end. I hard-coded our interpretation of HOST_NAME_MAX as 64--on Linux that has been the value since version 1.0 of the kernel... I don't think it will be changing any time soon, and since systemd is Linux-only, we don't have to worry about other kernels. But, just in case, I included a commented out version that uses cpp to get the value.
2013-09-26Merge branch 'devtools' (early part)Luke Shumaker
Conflicts: arch-nspawn.in This effectively reverts my machine_name patch; I took a simpler route to dealing with a working_dir with funny characters in it, using a different scheme for the machine_name. This fixes the problems devtools' original scheme had, so I'm going back to that.
2013-09-23checkpkg: I missed a case of string interpolationLuke Shumaker
2013-09-11arch-nspawn: set machine_name in a safer/different way, don't hide errorslibretools-20130914Luke Shumaker
2013-08-19makechrootpkg: add generic support for additional bind mountsDave Reisner
Piggyback on systemd-nspawn's --bind and --bind-ro flags to allow arbitrary mount points to be added to the build container. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-08-18checkpkg: avoid using PKGEXT to guess tarball nameDave Reisner
We can't rely on PKGEXT since it's not sourced from a controlled location. Case in point, if a user sets PKGEXT=.pkg.tar.gz, checkpkg fails and offers no easy workaround. Instead, use glob expansion to resolve the name of the tarball, bailing if it can't be found definitively. This involves some refactoring to avoid modifying PWD (which is advisable regardless). Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-08-18ensure that PKGBUILDs aren't sourced via PATHDave Reisner
Fixes FS#36378. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-08-18arch-nspawn: allow oddly named directoriesDave Reisner
This fixes various errors one might encounter when trying to use a build root or cachedir with whitespace in it. Note that the cachedir fix is not a complete one, as pacman's output is unreliable (and not meant for parsing here). Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-08-18arch-nspawn: avoid escaping mount_argsDave Reisner
eval is no longer involved in the execution of systemd-nspawn, so we no longer need a layer of escaping on the arguments. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-08-16Avoid having code/variables in format strings.Luke Shumaker
2013-08-16support formatted messages to stat_busy, lock, and slockLuke Shumaker
2013-08-16Merge remote-tracking branch 'remotes/devtools/master'Luke Shumaker
2013-08-08Prepare release20130808Pierre Schmitz
2013-08-08Update makepkg.conf from pacman 4.1.2Pierre Schmitz
2013-08-08Makefile: validate generated files as part of buildDave Reisner
For example... $ make GEN checkpkg GEN commitpkg GEN archco archco: line 179: unexpected EOF while looking for matching `"' archco: line 181: syntax error: unexpected end of file make: *** [archco] Error 2 Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-08-08avoid injecting code into the format stringDave Reisner
Now that die() properly forwards arguments to error(), we can expect that the first arg is a format string and not the entirety of the output. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-08-08common: Properly forward arguments from die to errorDave Reisner
Also allow this function to be called without arguments, in which case, don't call error at all. Some uses of this function wrongly assumed that this was already allowed. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-08-08arch-nspawn: remove leading - from the machine name/hostnameFlorian Pritz
Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
2013-06-15mkarchroot: update usage() textLuke Shumaker
2013-06-15makechrootpkg: ~/.makepkg.conf should take precedence over /etc/Luke Shumaker
2013-06-15makechrootpkg: handle makepkg_args betterLuke Shumaker
- handle it as an array - have the usage text print out the actual default args, instead of the defaults plus whatever has been parsed before `-h` - getopts turns any unknown flag into `-?`; don't add `*)` to makepkg_args - use in_array to see if it contains -R instead of looping ourselfs - pass it as a series of flags to /chrootbuild; preserving whitespace.
2013-06-15Merge branch 'devtools'Luke Shumaker
2013-06-15Merge commit '7ca4e'Luke Shumaker
Conflicts: makechrootpkg.in
2013-06-15Merge commit 'abba'Luke Shumaker
Conflicts: makechrootpkg.in
2013-06-15Merge commit 'a7a0': merge our and their lock functionsLuke Shumaker
Arch's have shorter names, and properly escape the filename. Ours create the directories, and check if the locks are already open. The best of both worlds. When merging the usages of them, I used arch's messages. Ours are too long, even if they are more informative.
2013-06-15Merge commit '0e98'Luke Shumaker
2013-06-15redo the lock functions to not append .lockLuke Shumaker
mkarchroot.in didn't need modified because it already (incorrectly) had .lock in the filename
2013-06-15Merge commit '4535'Luke Shumaker
Conflicts: makechrootpkg.in mkarchroot.in
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-12 17:09:09 +0000