void-packages

Void Source Packages
git clone git://ezup.dev/void-packages.git
Log | Files | Refs | README | LICENSE

commit 304a3173b4ea9aa546a013675cb55d5b06a396ea
parent df674a2f6cae4ed919ae40a6a0eac66c69f691e5
Author: Dash Eclipse <dash@ezup.dev>
Date:   Tue,  6 Oct 2020 09:02:06 +0000

Merge builds into one directory

Diffstat:
MREADME | 40++++------------------------------------
Mezup/build-pkg.sh | 12++++++------
Mezup/delete-pkg.sh | 8+++-----
Mezup/gen-repoinfo.sh | 15++++++---------
Aezup/pkg-list.txt | 38++++++++++++++++++++++++++++++++++++++
Mezup/rebuild-repodata.sh | 13+++++--------
Mezup/sign-repos.sh | 32++++++++++++++++++--------------
Mezup/sync-repos.sh | 6++----
Aezup/xupdategit | 34++++++++++++++++++++++++++++++++++
9 files changed, 116 insertions(+), 82 deletions(-)

diff --git a/README b/README @@ -1,39 +1,7 @@ Dash Eclipse's Void Linux source packages collection ---------------------------------------------------- -Tags: #git #unavailable - -Modified packages ------------------ - - dwm systray, bottomstack, nordtheme-color - lilo keytab-lilo patch - pass #git - slock scrollback, scrollback-mouse, nordtheme - stagit multiline-select - - -New packages ------------- - - bash-insulter #fetch - bpm-tools - dwl #git - font-jetbrains-mono-ttf #binary - font-kiwi-otb #fetch #git - https-dns-proxy #git #unavailable - oggfwd #git_archive - python3-bpytop - rig - scroll #git - sls #security_risk - softethervpn #nocross - stagit-gopher - swaylock-effects - trojan - wshowkeys #git #nocross - wterm #git - ydotool - zsh-insulter #fetch - zsh-theme-powerlevel10k #nocross #binary_gitstatusd - +For packages and repository information, check +./ezup/pkg-list.txt -- list of packages +./srcpkgs -- package template +$REPO/info.html -- (generated) diff --git a/ezup/build-pkg.sh b/ezup/build-pkg.sh @@ -4,12 +4,12 @@ for pkg in "$@"; do echo "\n\n## Cleaning...\n" ./xbps-src clean - echo "\n\n## Building $pkg (x86_64-musl)...\n" - ./xbps-src -r musl pkg $pkg - - echo "\n\n## Building $pkg (armv7l-musl)...\n" - ./xbps-src -a armv7l-musl -r musl pkg $pkg + echo "\n\n## Building $pkg (x86_64-musl)...\n" # x86_64-musl + ./xbps-src pkg $pkg echo "\n\n## Building $pkg (aarch64)...\n" - ./xbps-src -a aarch64-musl -r aarch64 pkg $pkg + ./xbps-src -a aarch64-musl pkg $pkg + + echo "\n\n## Building $pkg (armv7l-musl)...\n" + ./xbps-src -a armv7l-musl pkg $pkg done diff --git a/ezup/delete-pkg.sh b/ezup/delete-pkg.sh @@ -1,7 +1,5 @@ #!/bin/sh -for dir in aarch64 musl; do - rm -v hostdir/binpkgs/$dir/${1}-*.xbps 2>/dev/null - rm -v hostdir/binpkgs/$dir/${1}-*.xbps.sig 2>/dev/null - rm -v hostdir/binpkgs/$dir/*-repodata 2>/dev/null -done +rm -v hostdir/binpkgs/${1}-*.xbps 2>/dev/null +rm -v hostdir/binpkgs/${1}-*.xbps.sig 2>/dev/null +rm -v hostdir/binpkgs/*-repodata 2>/dev/null diff --git a/ezup/gen-repoinfo.sh b/ezup/gen-repoinfo.sh @@ -28,16 +28,13 @@ git clone <a href="git://ezup.dev/void-packages.git">git://ezup.dev/void-package 1. Copy the main repository configuration file to /etc/xbps.d - # cp /usr/share/xbps.d/00-repository-main.conf /etc/xbps.d/00-repository-main.conf + # cp /usr/share/xbps.d/00-repository-main.conf /etc/xbps.d/ 2. To get packages which only includes in this repository, - add corresponding repository after your main repository + add this repository after your main one - # for x86_64-musl, armv7l-musl - repository=<a href="https://ezup.dev/repo/voidlinux/current/musl" target="_blank">https://ezup.dev/repo/voidlinux/current/musl</a> - - # for aarch64-musl - repository=<a href="https://ezup.dev/repo/voidlinux/current/aarch64" target="_blank">https://ezup.dev/repo/voidlinux/current/aarch64</a> + # x86_64-musl, aarch64-musl, armv7l-musl + repository=<a href="https://ezup.dev/repo/voidlinux/current" target="_blank">https://ezup.dev/repo/voidlinux/current</a> 3. Synchronize repositories, install packages you need @@ -55,7 +52,7 @@ template, build it by yourself and optionally self-host your own repository. EOF - ls -v1 $REPODIR/musl/*.x86_64-musl.xbps $REPODIR/musl/*.noarch.xbps \ + ls -v1 $REPODIR/*.x86_64-musl.xbps $REPODIR/*.noarch.xbps \ | xargs -I{} basename {} | sed 's/.\(x86_64-musl\|noarch\).xbps$//' \ | rev | sed 's/-/ /; s/_/ - /' | rev \ | tac | sort -uk1,1 \ @@ -81,7 +78,7 @@ _EOF } if [ ! -z $1 ]; then - [ -f $1/musl/x86_64-musl-repodata ] || { echo "$1 is not a valid repo" && exit 0; } + [ -f $1/x86_64-musl-repodata ] || { echo "$1 is not a valid repo" && exit 0; } REPODIR=$1 get_info_html >$REPODIR/info.html else diff --git a/ezup/pkg-list.txt b/ezup/pkg-list.txt @@ -0,0 +1,38 @@ +# sed '/^$/d; /^#/d' ezup/pkg-list.txt | awk '{print $1}' #| xargs -L1 ezup/build-pkg.sh + + +# Tags: #git #fetch #binary #security #nocross + + +# Modified packages + + dwm systray, bottomstack, nordtheme-color + lilo keytab-lilo patch + pass #git + slock scrollback, scrollback-mouse, nordtheme + stagit multiline-select + + +# New packages + + bash-insulter #fetch + bpm-tools + dwl #git + font-jetbrains-mono-ttf #binary + font-kiwi-otb #fetch #git +# https-dns-proxy #git + oggfwd #git_archive + python3-bpytop + rig + scroll #git + sls #security_risk + softethervpn #nocross + stagit-gopher + swaylock-effects + trojan + wshowkeys #git #nocross + wterm #git + ydotool + zsh-insulter #fetch + zsh-theme-powerlevel10k #nocross #binary_gitstatusd + diff --git a/ezup/rebuild-repodata.sh b/ezup/rebuild-repodata.sh @@ -3,12 +3,9 @@ #openssl genrsa -des3 -out privkey.pem 4096 #./xbps-src binary-bootstrap -#rm hostdir/binpkgs/{musl,aarch64}/{*-repodata,*.xbps.sig} -rm hostdir/binpkgs/musl/*-repodata -rm hostdir/binpkgs/musl/*.sig -rm hostdir/binpkgs/aarch64/*-repodata -rm hostdir/binpkgs/aarch64/*.sig +#rm hostdir/binpkgs/{*-repodata,*.xbps.sig} +rm hostdir/binpkgs/*-repodata hostdir/binpkgs/*.sig -XBPS_TARGET_ARCH=x86_64-musl xbps-rindex -a hostdir/binpkgs/musl/*.x86_64-musl.xbps -XBPS_TARGET_ARCH=armv7l-musl xbps-rindex -a hostdir/binpkgs/musl/*.armv7l-musl.xbps -XBPS_TARGET_ARCH=aarch64-musl xbps-rindex -a hostdir/binpkgs/aarch64/*.aarch64-musl.xbps +XBPS_TARGET_ARCH=x86_64-musl xbps-rindex -a hostdir/binpkgs/*.x86_64-musl.xbps +XBPS_TARGET_ARCH=aarch64-musl xbps-rindex -a hostdir/binpkgs/*.aarch64-musl.xbps +XBPS_TARGET_ARCH=armv7l-musl xbps-rindex -a hostdir/binpkgs/*.armv7l-musl.xbps diff --git a/ezup/sign-repos.sh b/ezup/sign-repos.sh @@ -2,22 +2,26 @@ ## https://github.com/void-linux/void-infrastructure/blob/master/ansible/roles/buildmaster/templates/xbps-sign-repos.sh.j2 -MAINREPO="$PWD/hostdir/binpkgs" -REPOS="$MAINREPO/musl $MAINREPO/aarch64" +REPO="$PWD/hostdir/binpkgs" ARCHS="x86_64-musl armv7l-musl aarch64-musl" -for f in ${REPOS}; do - export XBPS_PASSPHRASE="$XBPS_PASSPHRASE" - for x in ${ARCHS}; do - export XBPS_TARGET_ARCH=$x - xbps-rindex -v -s \ - --signedby "Dash Eclipse" --privkey $HOME/.ssh/void-rsa ${f} - find ${f} -maxdepth 1 -name '*.xbps' -print0 | \ - xargs -L 1000 -r0 xbps-rindex -v -S \ - --signedby "Dash Eclipse" --privkey $HOME/.ssh/void-rsa - done - xbps-rindex -v -S \ - --signedby "Dash Eclipse" --privkey $HOME/.ssh/void-rsa ${f}/*.noarch.xbps +export XBPS_PASSPHRASE="$XBPS_PASSPHRASE" +for x in ${ARCHS}; do + export XBPS_TARGET_ARCH=$x + xbps-rindex -v -s \ + --signedby "Dash Eclipse" \ + --privkey $HOME/.ssh/void-rsa \ + ${REPO} + find ${REPO} -maxdepth 1 -name '*.xbps' -print0 | \ + xargs -L 1000 -r0 \ + xbps-rindex -v -S \ + --signedby "Dash Eclipse" \ + --privkey $HOME/.ssh/void-rsa done +xbps-rindex -v -S \ + --signedby "Dash Eclipse" \ + --privkey $HOME/.ssh/void-rsa \ + ${REPO}/*.noarch.xbps + exit 0 diff --git a/ezup/sync-repos.sh b/ezup/sync-repos.sh @@ -1,12 +1,10 @@ #!/bin/sh echo '\n\n### Syncing musl/...\n' -rsync -rv --delete hostdir/binpkgs/musl ../../repo/voidlinux/current/ - -echo '\n\n### Sync aarch64/...\n' -rsync -rv --delete hostdir/binpkgs/aarch64 ../../repo/voidlinux/current/ +rsync -rv --delete hostdir/binpkgs/ ../../repo/voidlinux/current/ echo '\n\n### Updating git based xlocate database...\n' ../../repo/voidlinux/xlocate/xupdategit +echo '\n\n### Generating info.html...\n' $(dirname $0)/gen-repoinfo.sh ../../repo/voidlinux/current diff --git a/ezup/xupdategit b/ezup/xupdategit @@ -0,0 +1,34 @@ +#!/bin/sh + +BASEDIR=$(realpath $(dirname $0)) +XLOCATE_GIT="$(realpath $BASEDIR/xlocate.git)" +XLOCATE_REPO="$(realpath $BASEDIR/../current)" + +xupdategit() { + set -e + DIR=$(mktemp -dt xlocate.XXXXXX) + DIR=$(/usr/bin/realpath -e "$DIR") + git init -q $DIR + cd $DIR + xbps-query -i --repository="$XLOCATE_REPO" -M -Ro '*' | awk ' + $0 ~ ": " { + s = index($0, ": ") + pkg = substr($0, 1, s-1) + file = substr($0, s+2) + sub(" *\\([^)]*\\)$", "", file) + print file >>pkg + }' + printf '%s\n' ./* | + LC_ALL= xargs -d'\n' -I'{}' -n1 -P "$(nproc)" -r -- \ + sort -o {} {} + git add ./* + git -c user.name=xupdategit -c user.email=xupdategit@none commit -q -m 'xupdategit' + git repack -ad + rm -rf "$XLOCATE_GIT" .git/COMMIT_EDITMSG .git/description \ + .git/index .git/hooks .git/logs + [ -n "${XLOCATE_GIT%/*}" ] && mkdir -p "${XLOCATE_GIT%/*}" + mv .git "$XLOCATE_GIT" + rm -rf "$DIR" +} + +xupdategit