From 20ad0e5d8238651b74fcc40cdb98574ae4159368 Mon Sep 17 00:00:00 2001 From: EndeavourOS Date: Wed, 26 Jul 2023 19:26:34 +0300 Subject: [PATCH] [eos-pkgbuild-setup] added option --pkgnames --- eos-pkgbuild-setup/PKGBUILD | 4 +-- .../assets.conf.mirrors.mirror1 | 35 +++++++++++++------ eos-pkgbuild-setup/assets.make | 6 +++- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/eos-pkgbuild-setup/PKGBUILD b/eos-pkgbuild-setup/PKGBUILD index 2ea2e8e8..508d119f 100644 --- a/eos-pkgbuild-setup/PKGBUILD +++ b/eos-pkgbuild-setup/PKGBUILD @@ -5,7 +5,7 @@ pkgname=eos-pkgbuild-setup pkgdesc="Environment setup and tools for building EOS packages." pkgver=2023 # new numbering! Previous was: 2022.12.25 -pkgrel=32.6 +pkgrel=32.7 arch=(any) license=(GPL2) url="https://github.com/endeavouros-team/PKGBUILDS/raw/master/eos-pkgbuild-setup" @@ -59,7 +59,7 @@ source=( sha512sums=('ef90d33ec65cf02aabc2c6aec9ac6ef9772aae7d33e7b960930904dcdf3dcde86bda132377b8ac435addba30fc6c34cb8d2f49074c96732800b3c4b7c5db85bf' '15b4a800e60d65a5b4e888a6baa5cb6336b78255ff39f8c54563c77bdbff2299b84e65d456452097c5cbd36df1fae2cdcab41f65b9d86a2c0b6b973f5cc577a9' 'be63de6c49f05f909a0b15e406eb43cad59cd15992ad1fa1ebda58245761fccd309f3aae76e6f3f86e6cd1e0d6279ed43a08aa7f7a2c312a493a55fe819dbc87' - '5557f1b8d8e003284542fe3a7c2d1b154cd4e7f45aec95d02043274e356806f022a2e864e5496c866ebd9263ec541f684469f3eac0197e17ff961012617fd221' + '4df10ac412e263157c2b7bf4b3119ede5ce86fcce84f3d2876d92cc3a1e6a1b2383c58501e6487421dccbce2d2f5fe874501f9c17a4ec820825ec678da770641' '6185ce690604d382eda4e9edf5d3a113f71d89c54e0fe23384bb53e421e127c98263dea799126776203c48ac8ba9c2732beb98360047da87226845436ab10c91' '57fe6b53b43148cc3aa87b65abd9017d532aef516db0be2b9fee1314f2dcacaee833daade2326bf724bcd439847cc4e7c5fcdd93759db3fd16f569b5f73f80ef' '4eedb9af024132bf9556eefe067c3afa31f213dd219645cb82c4be532461387d8c78ec3af623fa10db8ba2803b06ceb4bda09d968529196919163a8b0c166e03' diff --git a/eos-pkgbuild-setup/assets.conf.mirrors.mirror1 b/eos-pkgbuild-setup/assets.conf.mirrors.mirror1 index 6ea732e8..164190e9 100644 --- a/eos-pkgbuild-setup/assets.conf.mirrors.mirror1 +++ b/eos-pkgbuild-setup/assets.conf.mirrors.mirror1 @@ -137,17 +137,30 @@ PKGNAMES=( # Alphabetically ordered. zfs-utils/aur ) -if false ; then - PKGNAMES=( - dracut - # eos-hooks - # eos-lightdm-gtk-theme - # wgetpaste-eos - # kernel-install-for-dracut - # arc-gtk-theme-eos - # ckbcomp - ) -fi +case "$1" in + --pkgnames=*) # set PKGNAMES from command line + PKGNAMES=( ${1#*=} ) + ;; + "") + if false ; then + # set certain PKGNAMES to build + PKGNAMES=( + rate-mirrors/aur + # dracut + # eos-hooks + # eos-lightdm-gtk-theme + # wgetpaste-eos + # kernel-install-for-dracut + # arc-gtk-theme-eos + # ckbcomp + ) + fi + ;; + *) + echo "assets.conf: unsupported parameter '$1'" >&2 + exit 1 + ;; +esac # PKGNAMES_WAIT specifies which of the packages in PKGNAMES will not be built. # Include them in quotes because we use the pipe character '|' to separate package name and the version. diff --git a/eos-pkgbuild-setup/assets.make b/eos-pkgbuild-setup/assets.make index 64c3d63c..760a6ce8 100755 --- a/eos-pkgbuild-setup/assets.make +++ b/eos-pkgbuild-setup/assets.make @@ -1090,6 +1090,7 @@ Options: -n | -nl | --dryrun-local Show what would be done, but do nothing. Use local assets. -nn | -nr | --dryrun Show what would be done, but do nothing. -ad | --allow-downgrade New package may have smaller version number. + --pkgnames="X" X is a space separated list of packages to use instead of PKGNAMES array in assets.conf. --repoup (Advanced) Force update of repository database files. --aurdiff Show PKGBUILD diff for AUR packages. EOF @@ -1159,6 +1160,7 @@ Main2() local mirror_check_wait=180 local use_release_assets # currently only for [endeavouros] repo local save_folder="" + local PKGNAMES_PARAMETER="" local hook_pkgver="#" local hook_multiversion="+" @@ -1178,6 +1180,8 @@ Main2() --aurdiff) aurdiff=1 ;; --allow-downgrade | -ad) allow_downgrade=yes ;; + --pkgnames=*) PKGNAMES_PARAMETER="$xx" ;; + # currently not used! --mirrorcheck=*) mirror_check_wait="${xx#*=}";; --versuffix=*) pkgver_suffix="${xx#*=}" ;; @@ -1197,7 +1201,7 @@ Main2() source /etc/eos-pkgbuild-setup.conf # sets the base folder of everything [ -n "$EOS_ROOT" ] || DIE "EOS_ROOT cannot be empty!" - source $ASSETS_CONF # local variables (with CAPITAL letters) + source $ASSETS_CONF "$PKGNAMES_PARAMETER" # local variables (with CAPITAL letters) filelist_txt="$ASSETSDIR/repofiles.txt" use_filelist="$USE_GENERATED_FILELIST"