diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-11-26 02:32:16 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-11-26 06:37:32 -0600 |
| commit | 0f34e188657cb0c6b0c0dd0eb70536853a027ae3 (patch) | |
| tree | 21cc6df25bbcb0dc7d94403cec1126e56b4bf936 | |
| parent | f144274db8a4e51824f2e84032eb5ebcf4e938bf (diff) | |
| download | packages-0f34e188657cb0c6b0c0dd0eb70536853a027ae3.tar.gz packages-0f34e188657cb0c6b0c0dd0eb70536853a027ae3.tar.bz2 packages-0f34e188657cb0c6b0c0dd0eb70536853a027ae3.tar.xz packages-0f34e188657cb0c6b0c0dd0eb70536853a027ae3.zip | |
system/adelie-base: Fixes for beta5
* Promote utmps to Base Environment.
Ensures that commands that use utmpx functions work without the entire
POSIX environment being installed.
* Demote sharutils to POSIX/LSB environments.
Unneeded on the vast majority of systems.
* Remove .dirkeep files unintentionally included with 0.9.6.
* Remove superfluous second sed dependency.
Ref: #1097
Closes: #1107, #1123
| -rw-r--r-- | system/adelie-base/APKBUILD | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index f64d8895d..cc7d48397 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-base -pkgver=0.9.6 -pkgrel=1 +pkgver=0.9.7 +pkgrel=0 pkgdesc="The Adélie Linux Base System" url="https://www.adelielinux.org/" arch="noarch" @@ -14,7 +14,7 @@ _core_depends="apk-tools adelie-keys musl-utils shadow util-linux net-tools nvi sed psmisc less tzdata" depends="adelie-core binutils curl debianutils file gettys-openrc - kbd libarchive-tools mandoc patch sed sharutils sysklogd zsh" + kbd libarchive-tools mandoc patch sysklogd utmps zsh" makedepends="" makedepends_host="$depends" subpackages="adelie-core:core $pkgname-doc $pkgname-posix $pkgname-lsb dev @@ -47,22 +47,20 @@ package() { echo '' > "$pkgdir"/etc/shells # stupid inflatable stupid busybox - local i - for i in adduser addgroup; do - install -m755 "$srcdir"/$i "$pkgdir"/usr/sbin/$i + for _cmd in adduser addgroup; do + install -m755 "$srcdir"/$_cmd "$pkgdir"/usr/sbin/$_cmd done } core() { - core="The Adélie Linux minimal runtime environment" depends=$_core_depends + pkgdesc="The Adélie Linux minimal runtime environment" replaces="adelie-base" mkdir -p "$subpkgdir" mv -i "$pkgdir"/* "$subpkgdir"/ } doc() { - local _doc DOCS DOCS="CONTRIBUTING.rst LICENSE README.rst" for _doc in $DOCS; do install -Dm644 "$srcdir"/$pkgname-$pkgver/$_doc \ @@ -73,15 +71,15 @@ doc() { posix() { # We pull in vim for /usr/bin/ex, until apk has an alternatives system depends="adelie-base at bc cflow cxref ed fcron heirloom-devtools - heirloom-pax mailx mawk uucp utmps vim" + heirloom-pax mailx mawk sharutils uucp vim" pkgdesc="$pkgdesc - Additional POSIX tools" mkdir -p "$subpkgdir" return 0 } lsb() { - depends="adelie-base gettext-tiny gzip libarchive-tools linux-pam make - mawk ncurses nspr nss" + depends="adelie-base-posix gettext-tiny gzip libarchive-tools linux-pam + make ncurses nspr nss" pkgdesc="$pkgdesc - Additional LSB tools" mkdir -p "$subpkgdir" return 0 @@ -115,7 +113,7 @@ symbols() { return 0 } -sha512sums="757479ef71ce65c8d3a1c8b3ff5e22d85fbcb792556f90c4fdd996e19230b2ca5df4b2a7de5f509d57066e9766f937f9dc09c7f0c645193479bbec957547f167 adelie-base-0.9.6.tar.xz +sha512sums="897a4733c49bbb460ac815a95d812bc22f6d603ffebb4a5f4405be404cd526637191116e614d51377a1c2b322b44ac95c865cb1cfff6ec9d88c76eb6b5601888 adelie-base-0.9.7.tar.xz 37260d9315fd8d8b0df3dfb5bd3e1035a47ba1e43f33aa195e3feca6d169da282c1b067ef4603e7e9acaedbfef8b58cf490c00bdca444d43c9d570355ad29eac group 33aca5423feadd02cce1ac5598ab26ce4f10f2e0d955d953c5ec12b61e605d92b25c2449aec224923bf8affb4fa918458ab67e4292a29c357ad15b74ebc68183 passwd f2437ebfbc83aa6eaeec3a111aae98751215cebfaec3991ccc511be8c8938778ae46f15e07c7306bd431d036bc4ba49b33b724b839c125bd882d2e93c0314ae8 addgroup |