- Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [PATCH] makechrootpkg: keep *DEST, MAKEFLAGS & PACKAGER
by anthraxx＠archlinux.org 23 Mar '19

23 Mar '19

From: Matt Robinson <git(a)nerdoftheherd.com> If makechrootpkg is called as non-root, the {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER environment variables are lost in the call to check_root(). Add these to the passed keepenv list so that they are preserved instead. --- makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 4b72a36..dc647b3 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -341,7 +341,7 @@ main() { [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.' makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}} - check_root SOURCE_DATE_EPOCH,GNUPGHOME + check_root SOURCE_DATE_EPOCH,GNUPGHOME,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") -- 2.21.0

1 0

[arch-projects] [devtools] [PATCH] Create a general README
by Jelle van der Waa 22 Mar '19

22 Mar '19

Introduce a README which describes where to send patches and how to release a new version of devtools. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..7c6764e --- /dev/null +++ b/README.md @@ -0,0 +1,24 @@ +# Devtools - development tools for Arch Linux + +This repository contains tools for the Arch Linux distribution for building +and maintaining official repository packages. + +## Patches + +Patches can be send to arch-projects(a)archlinux.org or via a pull request on +Github. When sending patches to the mailing list make sure to set a valid +subjectprefix otherwise the email is denied by mailman. Git can be configured +as following. + +``` +git config format.subjectprefix 'devtools] [PATCH' +``` + +## Releasing + +1. bump the version in the Makefile +2. Commit everything as ```Version $(date + "%Y%m%d")``` +3. Create a new tag ```git tag -s $(date +"%Y%m%d")``` +4. Push changes +5. Upload the source tarball with ```make dist upload``` +6. Update the package -- 2.21.0

1 0

[arch-projects] [devtools] [PATCH 1/1] arch-nspawn: get all mirrors from host
by Christian Hesse 22 Mar '19

22 Mar '19

From: Christian Hesse <mail(a)eworm.de> Now that pacconf gives us all mirrors we can use them, instead of just the first one. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- arch-nspawn.in | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index b9c846e..661bbbd 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -60,17 +60,19 @@ fi pacconf_cmd=$(command -v pacman-conf || command -v pacconf) # shellcheck disable=2016 -host_mirror=$($pacconf_cmd --repo extra Server 2> /dev/null | head -1 | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#') +host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) # shellcheck disable=2016 -[[ $host_mirror == *file://* ]] && host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') # {{{ functions build_mount_args() { declare -g mount_args=() - if [[ -n $host_mirror_path ]]; then - mount_args+=("--bind-ro=$host_mirror_path") - fi + for host_mirror in "${host_mirrors[@]}"; do + if [[ $host_mirror == *file://* ]]; then + host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') + mount_args+=("--bind-ro=$host_mirror_path") + fi + done mount_args+=("--bind=${cache_dirs[0]}") @@ -81,7 +83,10 @@ build_mount_args() { copy_hostconf () { cp -a /etc/pacman.d/gnupg "$working_dir/etc/pacman.d" - echo "Server = $host_mirror" >"$working_dir/etc/pacman.d/mirrorlist" + + for host_mirror in "${host_mirrors[@]}"; do + echo "Server = $host_mirror" + done >"$working_dir/etc/pacman.d/mirrorlist" [[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf" [[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"

1 1

[arch-projects] [PATCH] [devtools] makechrootpkg: load COMPRESS* vars from makepkg.conf
by Maxim Baz 18 Mar '19

18 Mar '19

This allows using faster multicore compression tools like pixz Signed-off-by: Maxim Baz <archlinux(a)maximbaz.com> --- archbuild.in | 2 +- makechrootpkg.in | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/archbuild.in b/archbuild.in index bd5706d..e3d53ec 100644 --- a/archbuild.in +++ b/archbuild.in @@ -39,7 +39,7 @@ while getopts 'hcr:' arg; do esac done -check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME +check_root SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,MAKEFLAGS,PACKAGER,GNUPGHOME,COMPRESSGZ,COMPRESSXZ,COMPRESSLRZ,COMPRESSZ,COMPRESSBZ2,COMPRESSLZO # Pass all arguments after -- right to makepkg makechrootpkg_args+=("${@:$OPTIND}") diff --git a/makechrootpkg.in b/makechrootpkg.in index 4b72a36..e4b7ca3 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -29,9 +29,9 @@ usage() { echo 'command:' echo ' mkarchroot <chrootdir>/root base-devel' echo '' - echo 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER' - echo 'from makepkg.conf(5), if those variables are not part of the' - echo 'environment.' + echo 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS, PACKAGER' + echo 'and COMPRESS{{G,X,LR,}Z,BZ2,LZO} from makepkg.conf(5),' + echo 'if those variables are not part of the environment.' echo '' echo "Default makepkg args: ${default_makepkg_args[*]}" echo '' @@ -63,12 +63,18 @@ usage() { # - LOGDEST # - MAKEFLAGS # - PACKAGER +# - COMPRESSGZ +# - COMPRESSXZ +# - COMPRESSLRZ +# - COMPRESSZ +# - COMPRESSBZ2 +# - COMPRESSLZO load_vars() { local makepkg_conf="$1" var [[ -f $makepkg_conf ]] || return 1 - for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER; do + for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER COMPRESS{{G,X,LR,}Z,BZ2,LZO}; do [[ -z ${!var:-} ]] && eval "$(grep -a "^${var}=" "$makepkg_conf")" done @@ -185,7 +191,9 @@ prepare_chroot() { sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf" for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \ - "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'" + "MAKEFLAGS='${MAKEFLAGS:-}'" "PACKAGER='${PACKAGER:-}'" "COMPRESSGZ=(${COMPRESSGZ[*]:-})" \ + "COMPRESSXZ=(${COMPRESSXZ[*]:-})" "COMPRESSLRZ=(${COMPRESSLRZ[*]:-})" "COMPRESSZ=(${COMPRESSZ[*]:-})" \ + "COMPRESSBZ2=(${COMPRESSBZ2[*]:-})" "COMPRESSLZO=(${COMPRESSLZO[*]:-})" do grep -q "^$x" "$copydir/etc/makepkg.conf" && continue echo "$x" >>"$copydir/etc/makepkg.conf" -- 2.21.0

3 5

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-18-g6645701
by Jelle van der Waa 17 Mar '19

17 Mar '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via 6645701cb13a4801c870c8231d3cdc9988ce593c (commit) from 657497c91a67a29e990bed9911c77550d562aac0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6645701cb13a4801c870c8231d3cdc9988ce593c Author: Jelle van der Waa <jelle(a)archlinux.org> Date: Sun Mar 17 14:51:19 2019 +0100 sogrep: remove duplicate sogrep The rename of sogrep to sogrep.in failed to remove sogrep and adding it to .gitignore. Signed-off-by: Jelle van der Waa <jelle(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + sogrep | 98 -------------------------------------------------------------- 2 files changed, 1 insertion(+), 98 deletions(-) delete mode 100755 sogrep hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-17-g657497c
by Jelle van der Waa 16 Mar '19

16 Mar '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via 657497c91a67a29e990bed9911c77550d562aac0 (commit) from 90bb423304c96072cc3f7ea86ad9672414ed9183 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 657497c91a67a29e990bed9911c77550d562aac0 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Sat Mar 16 18:35:21 2019 +0100 doc: Add myself as maintainer Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> ----------------------------------------------------------------------- Summary of changes: doc/footer.asciidoc | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-16-g90bb423
by Jelle van der Waa 16 Mar '19

16 Mar '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via 90bb423304c96072cc3f7ea86ad9672414ed9183 (commit) via 23f248ccfbdefcb26d3d0bfa9a93e21642ba3d28 (commit) via eeb1c0e59ee8a5f7be4a6742ba6689af54e9ac7d (commit) from 936ff8da2fb3597d03ef018ec2aba0391e18d569 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 90bb423304c96072cc3f7ea86ad9672414ed9183 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Sat Mar 16 18:29:56 2019 +0100 sogrep: rename to sogrep.in so make clean works make clean removes all .in converted files to a file without .in which in the make clean step is removed. So running make clean will remove sogrep since it's specified as BINPROGS. In the future this steps should be removed for sogrep since it is a standalone script. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> commit 23f248ccfbdefcb26d3d0bfa9a93e21642ba3d28 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Sat Mar 16 18:27:13 2019 +0100 find-libdeps: fix indentation in case Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> commit eeb1c0e59ee8a5f7be4a6742ba6689af54e9ac7d Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Sat Mar 16 18:25:55 2019 +0100 doc: add man pages for find-{libdeps,libprovides} Add a simple man page for find-libdeps and find-libprovides. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> ----------------------------------------------------------------------- Summary of changes: Makefile | 4 +++- doc/{find-libprovides.1.asciidoc => find-libdeps.1.asciidoc} | 6 +++--- doc/find-libprovides.1.asciidoc | 12 ++++++------ find-libdeps.in | 2 +- sogrep | 0 sogrep => sogrep.in | 0 6 files changed, 13 insertions(+), 11 deletions(-) copy doc/{find-libprovides.1.asciidoc => find-libdeps.1.asciidoc} (84%) mode change 100644 => 100755 sogrep copy sogrep => sogrep.in (100%) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-13-g936ff8d
by Jelle van der Waa 13 Mar '19

13 Mar '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via 936ff8da2fb3597d03ef018ec2aba0391e18d569 (commit) via d123fee8ec5c98cbb6bfa4cecf66cb7cdd9c1855 (commit) via 4a532e38e7ed63770b400e924715178ac4c7664c (commit) from f61421a3f5f29f4f8447846c1135961487fb5db6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 936ff8da2fb3597d03ef018ec2aba0391e18d569 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Tue Mar 12 22:18:07 2019 +0100 doc: add Environment variables section to sogrep Add a section about environment variables which influence sogrep's behaviour. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> commit d123fee8ec5c98cbb6bfa4cecf66cb7cdd9c1855 Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Mon Feb 18 13:53:41 2019 +0100 doc: add man page for mkarchroot commit 4a532e38e7ed63770b400e924715178ac4c7664c Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Tue Feb 19 20:26:29 2019 +0100 crossrepomove: do not set svn propset svn propset's where determined to be non-reproducible and therefore where removed from svn. Don't introduce them when moving packages between repos. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> ----------------------------------------------------------------------- Summary of changes: Makefile | 3 ++- crossrepomove.in | 1 - doc/mkarchroot.1.asciidoc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ doc/sogrep.1.asciidoc | 11 +++++++++++ 4 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 doc/mkarchroot.1.asciidoc hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180531-10-gf61421a
by Levente Polyak 13 Mar '19

13 Mar '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via f61421a3f5f29f4f8447846c1135961487fb5db6 (commit) from 26b2ffc665fb78bfe3345892b7d740d5835387f2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f61421a3f5f29f4f8447846c1135961487fb5db6 Author: Sven-Hendrik Haase <svenstaro(a)gmail.com> Date: Fri Mar 8 07:19:02 2019 +0100 Add sogrep This is from Eli's dotfiles after he'd cleaned it up but never actually went ahead and made this PR. I figure it's time to add it. ----------------------------------------------------------------------- Summary of changes: Makefile | 6 ++-- doc/footer.asciidoc | 2 +- doc/sogrep.1.asciidoc | 31 ++++++++++++++++ sogrep | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 134 insertions(+), 3 deletions(-) create mode 100644 doc/sogrep.1.asciidoc create mode 100644 sogrep hooks/post-receive -- The official devtools repository

1 0

Re: [arch-projects] [mkinitcpio] Booting from ISO on NTFS
by Dave Reisner 06 Mar '19

06 Mar '19

On Wed, Mar 06, 2019 at 07:27:09PM +0000, Hietanen Jussi wrote: > Thanks for the reply! > > > One more quoestion: is there a RIGHT way to replace (to use my own) the init > script and the included init_functions when generating a new initramfs using > mkinitcpio (the default init is /usr/lib/initcpio/init)? The init script > defines the mount_handler (mount_handler=default_mount_handler) but it cannot > be changed, ie. it is hard coded, so I cannot "cleanly" (modularly) change it. > Well, yes, you can override it. Here's an example: https://github.com/anthonyrisinger/mkinitcpio-btrfs/blob/master/btrfs_hook#… > > BR, > > Jussi > > ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ > Lähettäjä: Dave Reisner <d(a)falconindy.com> > Lähetetty: 6. maaliskuuta 2019 20:57:38 > Vastaanottaja: Hietanen Jussi > Kopio: arch-projects(a)archlinux.org > Aihe: [mkinitcpio] Booting from ISO on NTFS > > On Wed, Mar 06, 2019 at 06:28:36PM +0000, Hietanen Jussi wrote: > > Hello! > > > > > > I've been trying to find for an answer for my problem from the arch wiki, IRC > > channel and from the google for the last a couple of days. > > > > > > My problem: I'm creating a live Arch build which could boot from a .iso image > > located on a Windows NTFS partition. I've successfully created a initramfs > that > > has ntfs-3g and is able to mount the NTFS partition, BUT the mkinitcpio lacks > > tools to create an init script which could boot from a file from a > filesystem. > > > > > > My boot procedure would be following; > > > > > > Boot the customized initramfs > > > > initramfs mounts the NTFS partition > > > > initramfs mounts the .ISO image as a loop device, > > > > initramfs changes the new root to the loop mounted .ISO > > > > the late userspace starts > > > > > > Can this be achieved by simply adding initcpio hooks or do I need to rewrite > > the whole early init script? > > > > cc'ing the arch-projects list where this belongs. > > Let's just get this out of the way up front: this sounds shaky at best. > You'd be better off booting the ISO directly from your bootloader if > that's an option. > > I'm not really sure if this is possible in the current implementation of > mkinitcpio. You'd need to, at a minimum, override the mount_handler to > mount your NTFS partition containing the ISO, and then setup the > loopback mounted ISO on /new_root. After that, you'll have to `mount > --move` the NTFS filesystem somewhere into the new system root, or do > the incredibly hacky thing of lazily umounting it (because you have an > open file handle to the ISO). > > Good luck, > dR

1 0