April 2019 - Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [PATCH] Add new tool: offload-build
by Eli Schwartz 04 Jun '19

04 Jun '19

This tool is useful for running makechrootpkg on a remote build server, and is by default hooked up to send a PKGBUILD and initiate a build on our shiny new build server "dragon". Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- manpage documentation hopefully coming tonight. Makefile | 1 + offload-build | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100755 offload-build diff --git a/Makefile b/Makefile index ba2d3e4..2306a17 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ IN_PROGS = \ BINPROGS = \ $(IN_PROGS) \ + offload-build \ sogrep CONFIGFILES = \ diff --git a/offload-build b/offload-build new file mode 100755 index 0000000..66609c6 --- /dev/null +++ b/offload-build @@ -0,0 +1,100 @@ +#!/bin/bash +# +# offload-build - build a PKGBUILD on a remote server using makechrootpkg. +# +# Copyright (c) 2019 by Eli Schwartz <eschwartz(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <https://www.gnu.org/licenses/>. +# + + +# global defaults suitable for use by Arch staff +repo=extra +arch=x86_64 +server=dragon.archlinux.org + +die() { printf "error: $1\n" "${@:2}"; exit 1; } + +usage() { + cat <<- _EOF_ + Usage: ${BASH_SOURCE[0]##*/} [--repo REPO] [--arch ARCHITECTURE] [--server SERVER] + + Build a PKGBUILD on a remote server using makechrootpkg. Requires a remote user + that can run archbuild without password auth. + + OPTIONS + -r, --repo Build against a specific repository (current: $repo) + -a, --arch Build against a specific architecture (current: $arch) + -s, --server Offload to a specific build server (current: $server) + -h, --help Show this help text +_EOF_ +} + +# option checking +while (( $# )); do + case $1 in + -h|--help) + usage + exit 0 + ;; + -r|--repo) + repo=$2 + shift 2 + ;; + -a|--arch) + arch=$2 + shift 2 + ;; + -s|--server) + server=$2 + shift 2 + ;; + *) + die "invalid argument: %s" "$1" + ;; + esac +done + +# multilib must be handled specially +if [[ $repo = multilib* ]]; then + arch= +fi + +trap 'rm -rf $SRCPKGDEST' EXIT + +# Use a source-only tarball as an intermediate to transfer files. This +# guarantees the checksums are okay, and guarantees that all needed files are +# transferred, including local sources, install scripts, and changelogs. +export SRCPKGDEST=$(mktemp -d) +makepkg --source || die "unable to make source package" + +mapfile -t files < <( + # This is sort of bash golfing but it allows running a mildly complex + # command over ssh with a single connection. + cat "$SRCPKGDEST"/*.src.tar.gz | + ssh $server ' + temp="${XDG_CACHE_HOME:-$HOME/.cache}/offload-build" && + mkdir -p "$temp" && + temp=$(mktemp -d -p "$temp") && + cd "$temp" && + { + bsdtar --strip-components 1 -xvf - && + script -qfc '"${repo}${arch:+-$arch}-build"' /dev/null && + printf "%s\n" "" "-> build complete" && + printf "\t%s\n" "$temp"/* + } >&2 && + makepkg --packagelist +') + +(( ${#files[@]} )) && printf '%s\n' '' '-> copying files...' && scp "${files[@]/#/$server:}" . -- 2.21.0

1 4

[arch-projects] [mkinitcpio] [PATCH] lsinitcpio: Add zstd decompression support
by Jelle van der Waa 30 Apr '19

30 Apr '19

Add detection support for zstd compressed initramfs, the magic number of zstd is defined as 0xFD2FB528. https://github.com/facebook/zstd/blob/dev/doc/zstd_compression_format.md Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- lsinitcpio | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lsinitcpio b/lsinitcpio index bcb4a19..d44a714 100755 --- a/lsinitcpio +++ b/lsinitcpio @@ -131,6 +131,12 @@ detect_filetype() { return fi + read -rd '' bytes < <(hexdump -n 4 -e '"%x"' "$1") + if [[ $bytes = 'fd2fb528' ]]; then + echo 'zstd' + return + fi + # still nothing? hrmm, maybe the user goofed and it's a kernel if kver "$1" >/dev/null; then die '%s is a kernel image, not an initramfs image!' "$1" -- 2.21.0

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20190329-2-g321e998
by Jelle van der Waa 20 Apr '19

20 Apr '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 321e998020cfdb337c1ebc1ac41f5e729b9e276c (commit) via c86823a2d4a4152c71faa1c3bab227756232996f (commit) from a49f55cbed51c815a9392c9f7fff5f8cec385935 (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 321e998020cfdb337c1ebc1ac41f5e729b9e276c Author: Erich Eckner <git(a)eckner.net> Date: Tue Apr 2 09:32:43 2019 +0200 fix whitespace/indentation errors Some lines are indented by spaces, while adjacent lines are indentet by tabs. We should use tabs on both. Signed-off-by: Erich Eckner <git(a)eckner.net> commit c86823a2d4a4152c71faa1c3bab227756232996f Author: Erich Eckner <git(a)eckner.net> Date: Wed Apr 17 13:16:36 2019 +0200 is_same_fs() in lib/archroot.sh should use $1 and $2, not $1 and $1 The old behaviour would always evaluate to true - this is certainly not what that function should do. Signed-off-by: Erich Eckner <git(a)eckner.net> ----------------------------------------------------------------------- Summary of changes: archbuild.in | 2 +- find-libdeps.in | 2 +- lib/archroot.sh | 2 +- mkarchroot.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCH] is_same_fs() in lib/archroot.sh should use $1 and $2, not $1 and $1
by arch＠eckner.net 17 Apr '19

17 Apr '19

From: Erich Eckner <git(a)eckner.net> The old behaviour would always evaluate to true - this is certainly not what that function should do. Signed-off-by: Erich Eckner <git(a)eckner.net> --- lib/archroot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/archroot.sh b/lib/archroot.sh index f2796034..2c03c827 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -42,7 +42,7 @@ is_subvolume() { # return : whether $path_a and $path_b are on the same filesystem ## is_same_fs() { - [[ "$(stat -c %d "$1")" == "$(stat -c %d "$1")" ]] + [[ "$(stat -c %d "$1")" == "$(stat -c %d "$2")" ]] } ## -- 2.21.0

1 0

[arch-projects] [namcap] [PATCH] remove pointless mkdir -p in parsepkgbuild
by Eli Schwartz 11 Apr '19

11 Apr '19

As far as I can tell, this was never used. In commit 9b56647abc8dc33bf138d4b260b103c8d9265b7d the parsepkgbuild script was switched from defining a PATH as a directory in /tmp, to actually passing in a PATH=/dummy to `env -i`... which makes sense as the defined PATH did not used to be used. However, even before that, it's not safe to use mkdir -p in order to define a restricted shell without access to the PATH, as it's not guaranteed to be owned by the creator. In any event, the time for mkdir -p is long past. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- parsepkgbuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/parsepkgbuild b/parsepkgbuild index 009e89e..bedb0de 100755 --- a/parsepkgbuild +++ b/parsepkgbuild @@ -1,7 +1,5 @@ #!/bin/bash -mkdir -p /tmp/parsepkgbuild - source /etc/makepkg.conf PARSE_PKGBUILD_PATH=${PARSE_PKGBUILD_PATH:-/usr/share/namcap} -- 2.21.0

1 0

[arch-projects] [namcap] [PATCH 1/2] parsepkgbuild: reduce a lot of boilerplate by being more templated
by Eli Schwartz 11 Apr '19

11 Apr '19

When listing out the contents of a variable, use loops and references to the variables in order to reduce code and make it easier to extend. In the future, a new metadata type can be added simply by appending to meta_keys=() Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- parsepkgbuild.sh | 127 +++++------------------------------------------ 1 file changed, 12 insertions(+), 115 deletions(-) diff --git a/parsepkgbuild.sh b/parsepkgbuild.sh index d85574d..66cea40 100644 --- a/parsepkgbuild.sh +++ b/parsepkgbuild.sh @@ -18,123 +18,20 @@ fi if [ -n "$pkgdesc" ]; then echo -e "%DESC%\n$pkgdesc\n" fi -if [ -n "$groups" ]; then - echo "%GROUPS%" - for i in ${groups[@]}; do echo $i; done - echo "" -fi - -if [ -n "$url" ]; then - echo -e "%URL%\n$url\n" -fi -if [ -n "$license" ]; then - echo "%LICENSE%" - for i in ${license[@]}; do echo $i; done - echo "" -fi -if [ -n "$arch" ]; then - echo "%ARCH%" - for i in ${arch[@]}; do echo $i; done - echo "" -fi -if [ -n "$builddate" ]; then - echo -e "%BUILDDATE%\n$builddate\n" -fi -if [ -n "$packager" ]; then - echo -e "%PACKAGER%\n$packager\n" -fi - -if [ -n "$replaces" ]; then - echo "%REPLACES%" - for i in "${replaces[@]}"; do echo $i; done - echo "" -fi -if [ -n "$force" ]; then - echo -e "%FORCE%\n" -fi -# create depends entry -if [ -n "$depends" ]; then - echo "%DEPENDS%" - for i in "${depends[@]}"; do echo $i; done - echo "" -fi -if [ -n "$makedepends" ]; then - echo "%MAKEDEPENDS%" - for i in "${makedepends[@]}"; do echo $i; done - echo "" -fi -if [ -n "$optdepends" ]; then - echo "%OPTDEPENDS%" - for i in "${optdepends[@]}"; do echo $i; done - echo "" -fi -if [ -n "$conflicts" ]; then - echo "%CONFLICTS%" - for i in "${conflicts[@]}"; do echo $i; done - echo "" -fi -if [ -n "$provides" ]; then - echo "%PROVIDES%" - for i in "${provides[@]}"; do echo $i; done - echo "" -fi -if [ -n "$backup" ]; then - echo "%BACKUP%" - for i in "${backup[@]}"; do echo $i; done - echo "" -fi -if [ -n "$options" ]; then - echo "%OPTIONS%" - for i in "${options[@]}"; do echo $i; done - echo "" -fi -if [ -n "$source" ]; then - echo "%SOURCE%" - for i in "${source[@]}"; do echo $i; done - echo "" -fi -if [ -n "$validpgpkeys" ]; then - echo "%VALIDGPGKEYS%" - for i in "${validpgpkeys[@]}"; do echo $i; done - echo "" -fi -if [ -n "$md5sums" ]; then - echo "%MD5SUMS%" - for i in "${md5sums[@]}"; do echo $i; done - echo "" -fi -if [ -n "$sha1sums" ]; then - echo "%SHA1SUMS%" - for i in "${sha1sums[@]}"; do echo $i; done - echo "" -fi -if [ -n "$sha224sums" ]; then - echo "%SHA224SUMS%" - for i in "${sha224sums[@]}"; do echo $i; done - echo "" -fi -if [ -n "$sha256sums" ]; then - echo "%SHA256SUMS%" - for i in "${sha256sums[@]}"; do echo $i; done - echo "" -fi -if [ -n "$sha384sums" ]; then - echo "%SHA384SUMS%" - for i in "${sha384sums[@]}"; do echo $i; done - echo "" -fi -if [ -n "$sha512sums" ]; then - echo "%SHA512SUMS%" - for i in "${sha512sums[@]}"; do echo $i; done - echo "" -fi - -if [ -n "$install" ]; then - echo -e "%INSTALL%\n$install\n" -fi +meta_keys=(groups url license arch builddate packager replaces force depends + makedepends optdepends conflicts provides backup options source + validpgpkeys {md5,sha{1,224,256,384,512}}sums install) +for key in "${meta_keys[@]}"; do + arr="$key[@]" + if [[ -n ${!key} ]]; then + echo "%${key^^}%" + for i in "${!arr}"; do echo "$i"; done + echo "" + fi +done -unset i +unset arr key meta_keys i echo "%SETVARS%" compgen -A variable } -- 2.21.0

1 1

[arch-projects] [namcap] [PATCH] Add rule to report on unneeded dependencies from hooks
by Eli Schwartz 11 Apr '19

11 Apr '19

Just as it is unnecessary to run certain commands in a post_upgrade script, if a hook already runs it, so too is it usually unnecessary to depend on the package that installs the hook. Sometimes these dependencies are left in even when the install script is removed, because people lack understanding in the true subtleties of hooks and the commands they run -- but the commands do not depend on the list of files which trigger them in order to function, and are fully operative when installed later. In fact, they will already be required by the software that uses the results. e.g. desktop-file-utils and shared-mime-info provide hooks to compile the mime and desktop file databases, but upon first installing the hook, a full database will already be compiled. The hook does not need to be triggered by the filepath, and thus does not need to be a dependency of every package that provides a desktop or mime file. Instead, desktop environments which need a mime/desktop file database will depend on the package and thereby ensure the database exists when needed. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- With this plus my previous patch, namcap will stop warning when these dependencies are missing, and instead, warn when they are used. I've yet to hear a convincing reason why these dependencies would be wanted -- I suspect they exist mostly because of inertia, or because they were copied from another (historic?) PKGBUILD that was used as a role model. Namcap/rules/__init__.py | 1 + Namcap/rules/hookdepends.py | 48 +++++++++++++++++++++++++++++++++++++ namcap-tags | 8 ++++--- 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 Namcap/rules/hookdepends.py diff --git a/Namcap/rules/__init__.py b/Namcap/rules/__init__.py index 1e05326..525dbc6 100644 --- a/Namcap/rules/__init__.py +++ b/Namcap/rules/__init__.py @@ -31,6 +31,7 @@ from . import ( fileownership, gnomemime, hardlinks, + hookdepends, infodirectory, javafiles, kdeprograms, diff --git a/Namcap/rules/hookdepends.py b/Namcap/rules/hookdepends.py new file mode 100644 index 0000000..dcf03a1 --- /dev/null +++ b/Namcap/rules/hookdepends.py @@ -0,0 +1,48 @@ +# +# namcap rules - hookdepends +# Copyright (C) 2019 Eli Schwartz <eschwartz(a)archlinux.org> +# Copyright (C) 2016 Kyle Keen <keenerd(a)gmail.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +import re +from Namcap.ruleclass import * + +class HookDependsRule(TarballRule): + name = "hookdepends" + description = "Check for redundant hook dependencies" + subrules = [ + { + 'path': '^usr/share/applications/.*\.desktop$', + 'dep': 'desktop-file-utils', + }, + { + 'path': '^usr/share/mime$', + 'dep': 'shared-mime-info', + } + ] + def analyze(self, pkginfo, tar): + names = [entry.name for entry in tar] + for subrule in self.subrules: + pattern = re.compile(subrule['path']) + if any(pattern.search(n) for n in names): + dep = subrule['dep'] + if dep in pkginfo['depends']: + self.warnings = [('external-hooks-unneeded-warning', ())] + self.infos.append(('external-hooks-unneeded-name %s', dep)) + + +# vim: set ts=4 sw=4 noet: diff --git a/namcap-tags b/namcap-tags index 17b9506..84cc3f7 100644 --- a/namcap-tags +++ b/namcap-tags @@ -1,11 +1,11 @@ # namcap tags file -# The tags file consists of lines specifying the human readable form of the -# hyphenated tags used in the namcap code. A line beginning with a '#' is +# The tags file consists of lines specifying the human readable form of the +# hyphenated tags used in the namcap code. A line beginning with a '#' is # treated as a comment. Otherwise the format of the file is: # # machine-parseable-tag %s :: This is machine parseable tag %s # -# Note that a double colon (::) is used to separate the hyphenated tag from the +# Note that a double colon (::) is used to separate the hyphenated tag from the # human readable description. # rules tags @@ -26,6 +26,8 @@ empty-directory %s :: Directory (%s) is empty error-running-rule %s :: Error running rule '%s' external-hooks-name %s :: .INSTALL file runs a command (%s) provided by hooks. external-hooks-warning :: .INSTALL file runs a command provided by hooks. +external-hooks-unneeded-name %s :: unneeded dependency on a package (%s) run when needed by hooks. +external-hooks-unneeded-warning :: unneeded dependency on a package run when needed by hooks. extra-var-begins-without-underscore %s :: Non standard variable '%s' doesn't start with an underscore file-in-non-standard-dir %s :: File (%s) exists in a non-standard directory. file-in-temporary-dir %s :: File (%s) is in a temporary directory. -- 2.21.0

1 0

[arch-projects] [namcap] [PATCH] Remove no longer useful warnings that have missing keys
by Eli Schwartz 11 Apr '19

11 Apr '19

Arch Linux now has pacman hooks that provide automatic handling for update-{desktop,mime}-database without each package requiring a hard dependency and a post_upgrade hook. This means it is no longer correct to depend on the packages or provide an install script. Instead, remove this entirely. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Namcap/rules/__init__.py | 7 ++- Namcap/rules/mimefiles.py | 40 --------------- Namcap/rules/pathdepends.py | 9 ++-- Namcap/tests/package/test_mimefiles.py | 62 ------------------------ Namcap/tests/package/test_pathdepends.py | 10 +--- 5 files changed, 8 insertions(+), 120 deletions(-) delete mode 100644 Namcap/rules/mimefiles.py delete mode 100644 Namcap/tests/package/test_mimefiles.py diff --git a/Namcap/rules/__init__.py b/Namcap/rules/__init__.py index dcc950f..1e05326 100644 --- a/Namcap/rules/__init__.py +++ b/Namcap/rules/__init__.py @@ -1,7 +1,7 @@ -# +# # namcap rules - __init__ # Copyright (C) 2003-2009 Jason Chu <jason(a)archlinux.org> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# from types import ModuleType import Namcap.ruleclass @@ -37,7 +37,6 @@ from . import ( libtool, licensepkg, lotsofdocs, - mimefiles, missingbackups, pathdepends, perllocal, diff --git a/Namcap/rules/mimefiles.py b/Namcap/rules/mimefiles.py deleted file mode 100644 index f9d56f4..0000000 --- a/Namcap/rules/mimefiles.py +++ /dev/null @@ -1,40 +0,0 @@ -# -# namcap rules - mimefiles -# Copyright (C) 2009 Hugo Doria <hugo(a)archlinux.org> -# Copyright (C) 2011 Rémy Oudompheng <remy(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -from Namcap.ruleclass import * - -class MimeDesktopRule(TarballRule): - name = "mimedesktop" - description = "Check for MIME desktop file depends" - def analyze(self, pkginfo, tar): - for entry in tar: - if entry.issym(): - continue - if not entry.name.startswith("usr/share/applications"): - continue - if not entry.name.endswith(".desktop"): - continue - with tar.extractfile(entry) as f: - if not any(l.startswith(b"MimeType=") for l in f): - continue - pkginfo.detected_deps["desktop-file-utils"].append( ('desktop-file-utils-needed', ()) ) - break - -# vim: set ts=4 sw=4 noet: diff --git a/Namcap/rules/pathdepends.py b/Namcap/rules/pathdepends.py index 5bc4313..87f9758 100644 --- a/Namcap/rules/pathdepends.py +++ b/Namcap/rules/pathdepends.py @@ -1,7 +1,7 @@ -# +# # namcap rules - pathdepends # Copyright (C) 2016 Kyle Keen <keenerd(a)gmail.com> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# """ This contains a collection of essentially one-line rules: @@ -41,9 +41,6 @@ class PathDependsRule(TarballRule): {'path': '^usr/share/icons/hicolor$', 'dep':'hicolor-icon-theme', 'reason':'hicolor-icon-theme-needed-for-hicolor-dir'}, - {'path': '^usr/share/mime$', - 'dep':'shared-mime-info', - 'reason':'shared-mime-info-needed'}, ] def analyze(self, pkginfo, tar): names = [entry.name for entry in tar] diff --git a/Namcap/tests/package/test_mimefiles.py b/Namcap/tests/package/test_mimefiles.py deleted file mode 100644 index bfed439..0000000 --- a/Namcap/tests/package/test_mimefiles.py +++ /dev/null @@ -1,62 +0,0 @@ -# -# namcap tests - mimefiles -# Copyright (C) 2011 Rémy Oudompheng <remy(a)archlinux.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# - -import os -from Namcap.tests.makepkg import MakepkgTest -import Namcap.rules.mimefiles - -class MimeFilesTest(MakepkgTest): - pkgbuild = """ -pkgname=__namcap_test_mimefiles -pkgver=1.0 -pkgrel=1 -pkgdesc="A package" -arch=('i686' 'x86_64') -url="http://www.example.com/" -license=('GPL') -depends=('glibc') -source=() -options=(!purge !zipman) -build() { - true -} -package() { - mkdir -p "${pkgdir}/usr/share/applications" - echo "MimeType=applcation/pdf" > "${pkgdir}/usr/share/applications/foobar.desktop" -} -""" - def test_mimetype_in_desktop(self): - "Package with desktop files and an missing dependency" - pkgfile = "__namcap_test_mimefiles-1.0-1-%(arch)s.pkg.tar" % { "arch": self.arch } - with open(os.path.join(self.tmpdir, "PKGBUILD"), "w") as f: - f.write(self.pkgbuild) - self.run_makepkg() - pkg, r = self.run_rule_on_tarball( - os.path.join(self.tmpdir, pkgfile), - Namcap.rules.mimefiles.MimeDesktopRule - ) - self.assertEqual(pkg.detected_deps, - {"desktop-file-utils": [('desktop-file-utils-needed', ())] } - ) - self.assertEqual(r.errors, []) - self.assertEqual(r.warnings, []) - self.assertEqual(r.infos, []) - -# vim: set ts=4 sw=4 noet: diff --git a/Namcap/tests/package/test_pathdepends.py b/Namcap/tests/package/test_pathdepends.py index 48f153c..7abe2a2 100644 --- a/Namcap/tests/package/test_pathdepends.py +++ b/Namcap/tests/package/test_pathdepends.py @@ -2,7 +2,7 @@ # namcap tests - glibfiles # Copyright (C) 2011 Rémy Oudompheng <remy(a)archlinux.org> # Copyright (C) 2016 Kyle Keen <keenerd(a)gmail.com> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA -# +# import os from Namcap.tests.makepkg import MakepkgTest @@ -50,10 +50,6 @@ package() { # hicolor-icon-theme-needed-for-hicolor-dir mkdir -p "${pkgdir}/usr/share/icons/hicolor/64x64/apps" touch "${pkgdir}/usr/share/icons/hicolor/64x64/apps/example.png" - - # shared-mime-info-needed - mkdir -p "${pkgdir}/usr/share/mime/text" - touch "${pkgdir}/usr/share/mime/text/example.xml" } """ @@ -70,7 +66,6 @@ package() { {'dconf': [('dconf-needed-for-glib-schemas', ())], 'glib2': [('glib2-needed-for-gio-modules', ())], 'hicolor-icon-theme': [('hicolor-icon-theme-needed-for-hicolor-dir', ())], - 'shared-mime-info': [('shared-mime-info-needed', ())], }) self.assertEqual(r.errors, []) self.assertEqual(r.warnings, []) @@ -78,4 +73,3 @@ package() { # vim: set ts=4 sw=4 noet: - -- 2.21.0

1 1

[arch-projects] [devtools] [PATCH] $pacconf_cmd in arch-nspawn should use the provided config file (-C)
by arch＠eckner.net 02 Apr '19

02 Apr '19

From: Erich Eckner <git(a)eckner.net> If arch-nspawn is called with -C, pacman inside the chroot will use the provided configuration file. This should also be the case for $pacconf_cmd when determining the remote servers. For example, Arch Linux 32 provides separate pacman configurations which use /etc/pacman.d/mirrorlist32 as mirrorlist for their build commands (extra-i686-build, etc.). This way, we can build i686 and x86_64 packages on the same x86_64 host with very minimal changes to devtools. Signed-off-by: Erich Eckner <git(a)eckner.net> --- arch-nspawn.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index e68e2e75..461154eb 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -60,8 +60,7 @@ fi pacconf_cmd=$(command -v pacman-conf || command -v pacconf) # shellcheck disable=2016 -host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) -# shellcheck disable=2016 +host_mirrors=($($pacconf_cmd ${pac_conf+--conf $pac_conf} --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) # {{{ functions build_mount_args() { -- 2.21.0

1 1

[arch-projects] [devtools] [PATCH] fix whitespace/indentation errors
by arch＠eckner.net 02 Apr '19

02 Apr '19

From: Erich Eckner <git(a)eckner.net> Some lines are indented by spaces, while adjacent lines are indentet by tabs. We should use tabs on both. Signed-off-by: Erich Eckner <git(a)eckner.net> --- archbuild.in | 2 +- find-libdeps.in | 2 +- mkarchroot.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/archbuild.in b/archbuild.in index bd5706d5..163a1082 100644 --- a/archbuild.in +++ b/archbuild.in @@ -71,7 +71,7 @@ else -C "@pkgdatadir@/pacman-${repo}.conf" \ -M "@pkgdatadir@/makepkg-${arch}.conf" \ "${chroots}/${repo}-${arch}/root" \ - pacman -Syu --noconfirm || abort + pacman -Syu --noconfirm || abort fi # Always build official packages reproducibly diff --git a/find-libdeps.in b/find-libdeps.in index 07ba3d84..7a3e6f5d 100644 --- a/find-libdeps.in +++ b/find-libdeps.in @@ -57,7 +57,7 @@ process_sofile() { case $script_mode in deps) find_args=(-perm -u+x);; - provides) find_args=(-name '*.so*');; + provides) find_args=(-name '*.so*');; esac find . -type f "${find_args[@]}" | while read -r filename; do diff --git a/mkarchroot.in b/mkarchroot.in index 52e363fc..a9a5a0fe 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -84,7 +84,7 @@ while read -r varname; do done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$') env -i "${_env[@]}" \ pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ - "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' + "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen" echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf" -- 2.21.0

1 0