August 2015 - Arch-projects - lists.archlinux.org

[arch-projects] [DEVTOOLS][PATCH 1/3] archbuild: build without updating the chroot
by seblu＠archlinux.org 28 Aug '15

28 Aug '15

From: Sébastien Luttringer <seblu(a)seblu.net> Useful when you need to build with an outdated package version --- archbuild.in | 5 ++++- zsh_completion.in | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/archbuild.in b/archbuild.in index 9c5d706..7d8d2a9 100644 --- a/archbuild.in +++ b/archbuild.in @@ -17,11 +17,13 @@ else fi chroots='/var/lib/archbuild' clean_first=false +update=true usage() { echo "Usage: $cmd [options] -- [makechrootpkg args]" echo ' -h This help' echo ' -c Recreate the chroot before building' + echo ' -u Do not update the chroot before before building' echo ' -r <dir> Create chroots in this directory' echo '' echo "Default makechrootpkg args: ${makechrootpkg_args[*]}" @@ -34,6 +36,7 @@ orig_argv=("$@") while getopts 'hcr:' arg; do case "${arg}" in c) clean_first=true ;; + u) update=false ;; r) chroots="$OPTARG" ;; *) usage ;; esac @@ -67,7 +70,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then -M "@pkgdatadir@/makepkg-${arch}.conf" \ "${chroots}/${repo}-${arch}/root" \ "${base_packages[@]}" || abort -else +elif $update; then lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot" arch-nspawn \ -C "@pkgdatadir@/pacman-${repo}.conf" \ diff --git a/zsh_completion.in b/zsh_completion.in index 4c6dd99..8c418ea 100644 --- a/zsh_completion.in +++ b/zsh_completion.in @@ -4,6 +4,7 @@ m4_include(lib/valid-tags.sh) _archbuild_args=( '-c[Recreate the chroot before building]' + '-u[Do not update the chroot before before building]' '-r[Create chroots in this directory]:base_dir:_files -/' ) -- Sébastien "Seblu" Luttringer

3 8

[arch-projects] [dbscripts][PATCH] Add basic debug repo support
by Allan McRae 24 Aug '15

24 Aug '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- config.local.svn-community | 6 ++++-- config.local.svn-packages | 6 ++++-- db-functions | 3 +++ db-remove | 1 + db-update | 9 ++++++--- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/config.local.svn-community b/config.local.svn-community index 105ea66..69b6d61 100644 --- a/config.local.svn-community +++ b/config.local.svn-community @@ -1,10 +1,12 @@ -PKGREPOS=('community' 'community-testing' 'community-staging' 'multilib' 'multilib-testing' 'multilib-staging') +PKGREPOS=('community' 'community-debug' 'community-testing' 'community-testing-debug' + 'community-staging' 'community-staging-debug' 'multilib' 'multilib-debug' + 'multilib-testing' 'multilib-testing-debug' 'multilib-staging' 'multilib-staging-debug') PKGPOOL='pool/community' SRCPOOL='sources/community' SVNREPO='file:///srv/repos/svn-community/svn' SVNUSER='svn-community' TESTING_REPO='community-testing' -STABLE_REPOS=('community') +STABLE_REPOS=('community' 'community-debug) CLEANUP_DESTDIR="/srv/repos/svn-community/package-cleanup" SOURCE_CLEANUP_DESTDIR="/srv/repos/svn-community/source-cleanup" diff --git a/config.local.svn-packages b/config.local.svn-packages index 958a483..7648a98 100644 --- a/config.local.svn-packages +++ b/config.local.svn-packages @@ -1,10 +1,12 @@ -PKGREPOS=('core' 'extra' 'testing' 'staging' 'kde-unstable' 'gnome-unstable') +PKGREPOS=('core' 'core-debug' 'extra' 'extra-debug' + 'testing' 'testing-debug' 'staging' 'staging-debug' + 'kde-unstable' 'kde-unstable-debug' 'gnome-unstable' 'gnome-unstable-debug') PKGPOOL='pool/packages' SRCPOOL='sources/packages' SVNREPO='file:///srv/repos/svn-packages/svn' SVNUSER='svn-packages' TESTING_REPO='testing' -STABLE_REPOS=('core' 'extra') +STABLE_REPOS=('core' 'core-debug' 'extra' 'extra-debug') CLEANUP_DESTDIR="/srv/repos/svn-packages/package-cleanup" SOURCE_CLEANUP_DESTDIR="/srv/repos/svn-packages/source-cleanup" diff --git a/db-functions b/db-functions index 7e1b3aa..18d1504 100644 --- a/db-functions +++ b/db-functions @@ -372,6 +372,9 @@ check_pkgsvn() { in_array "${repo}" ${PKGREPOS[@]} || return 1 + # remove debug suffix for svn check + repo=${repo%-debug} + if [ ! -f "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}/${_pkgbase}" ]; then mkdir -p "${WORKDIR}/pkgbuilds/${repo}-${_pkgarch}" arch_svn export -q "${SVNREPO}/${_pkgbase}/repos/${repo}-${_pkgarch}/PKGBUILD" \ diff --git a/db-remove b/db-remove index 25cb9a7..f38602a 100755 --- a/db-remove +++ b/db-remove @@ -48,5 +48,6 @@ done for tarch in ${tarches[@]}; do arch_repo_remove "${repo}" "${tarch}" ${remove_pkgs[@]} + arch_repo_remove "${repo}-debug" "${tarch}" ${remove_pkgs[@]/%/-debug} repo_unlock $repo $tarch done diff --git a/db-update b/db-update index cdc35a5..e953e0e 100755 --- a/db-update +++ b/db-update @@ -16,7 +16,7 @@ fi repos=() for staging_repo in ${staging_repos[@]##*/}; do - if in_array ${staging_repo} ${PKGREPOS[@]}; then + if in_array ${staging_repo} ${PKGREPOS[@]} ${PKGREPOS[@]/%/-debug}; then repos+=(${staging_repo}) fi done @@ -55,9 +55,12 @@ for repo in ${repos[@]}; do die "Package ${repo}/${pkg##*/} does not have a valid packager" fi done - if ! check_splitpkgs ${repo} ${pkgs[@]}; then - die "Missing split packages for ${repo}" + if [[ $repo != *-debug ]]; then + if ! check_splitpkgs ${repo} ${pkgs[@]}; then + die "Missing split packages for ${repo}" + fi fi + # TODO: add check that non-debug version of debug packages exist else die "Could not read ${STAGING}" fi -- 2.5.0

1 1

[arch-projects] [devtools][PATCH] Upload debug packages if available
by Allan McRae 24 Aug '15

24 Aug '15

Debug packages are uploaded to staging/$repo-debug Signed-off-by: Allan McRae <allan(a)archlinux.org> --- commitpkg.in | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/commitpkg.in b/commitpkg.in index d779e96..c7c9a2f 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -122,6 +122,7 @@ if [[ -n $(svn status -q) ]]; then fi declare -a uploads +declare -a debugs declare -a commit_arches declare -a skip_arches @@ -153,6 +154,25 @@ for _arch in ${arch[@]}; do die "Signature %s.sig is incorrect!" "$pkgfile" fi uploads+=("$sigfile") + + # check for debug package + if ! pkgfile==$(find_cached_package "$_pkgname-debug" "$fullver" "${_arch}"); then + continue + fi + debugs+=("$pkgfile") + + sigfile="${pkgfile}.sig" + if [[ ! -f $sigfile ]]; then + msg "Signing package ${pkgfile}..." + if [[ -n $GPGKEY ]]; then + SIGNWITHKEY="-u ${GPGKEY}" + fi + gpg --detach-sign --use-agent --no-armor ${SIGNWITHKEY} "${pkgfile}" || die + fi + if ! gpg --verify "$sigfile" >/dev/null 2>&1; then + die "Signature %s.sig is incorrect!" "$pkgfile" + fi + debugs+=("$sigfile") done done @@ -180,6 +200,20 @@ if [[ ${#uploads[*]} -gt 0 ]]; then rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || die fi +if [[ ${#debugs[*]} -gt 0 ]]; then + new_debugs=() + + # convert to absolute paths so rsync can work with colons (epoch) + while read -r -d '' debug; do + new_debugs+=("$debugs") + done < <(realpath -z "${debugs[@]}") + + uploads=("${new_debugs[@]}") + unset new_debugs + msg 'Uploading all debug package and signature files' + rsync "${rsyncopts[@]}" "${debugs[@]}" "$server:staging/$repo-debug/" || die +fi + if [[ "${arch[*]}" == 'any' ]]; then if [[ -d ../repos/$repo-i686 && -d ../repos/$repo-x86_64 ]]; then pushd ../repos/ >/dev/null -- 2.5.0

1 0