aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2019-11-21 17:32:50 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-11-29 14:51:56 +0000
commit55464083de768e34737154e10544bb0be12bcf04 (patch)
tree03e3eeabaf2432aa846b4339dee032991d1a62a4
parent157b8d03ce31c45492734086b393400771f2dc84 (diff)
downloadaports-55464083de768e34737154e10544bb0be12bcf04.tar.bz2
aports-55464083de768e34737154e10544bb0be12bcf04.tar.xz
main/alpine-baselayout: seperate lang settings into its own file
This makes it easier to automated tools to modify this (e.g. openrc-settingsd)
-rw-r--r--main/alpine-baselayout/APKBUILD11
-rw-r--r--main/alpine-baselayout/locale3
-rw-r--r--main/alpine-baselayout/profile2
3 files changed, 11 insertions, 5 deletions
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index 0282fc6fc4..405b7da95a 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout
pkgver=3.2.0
-pkgrel=2
+pkgrel=3
pkgdesc="Alpine base dir structure and init scripts"
url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
arch="all"
@@ -14,6 +14,7 @@ install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
source="mkmntdirs.c
crontab
color_prompt
+ locale
aliases.conf
blacklist.conf
@@ -112,7 +113,10 @@ package() {
install -m755 "$builddir"/mkmntdirs "$pkgdir"/sbin/mkmntdirs
install -m600 "$srcdir"/crontab "$pkgdir"/etc/crontabs/root
- install -m644 "$srcdir"/color_prompt "$pkgdir"/etc/profile.d/
+ install -m644 \
+ "$srcdir"/color_prompt \
+ "$srcdir"/locale \
+ "$pkgdir"/etc/profile.d/
install -m644 \
"$srcdir"/aliases.conf \
"$srcdir"/blacklist.conf \
@@ -212,6 +216,7 @@ package() {
sha512sums="199a34716b1f029407b08679fed4fda58384a1ccefbbec9abe1c64f4a3f7ad2a89bc7c02fc19a7f791f7c6bb87f9f0c708cb3f18c027cb7f54f25976eba4b839 mkmntdirs.c
6e169c0975a1ad1ad871a863e8ee83f053de9ad0b58d94952efa4c28a8c221445d9e9732ad8b52832a50919c2f39aa965a929b3d5b3f9e62f169e2b2e0813d82 crontab
7fcb5df98b0f19e609cb9444b2e6ca5ee97f5f308eb407436acdd0115781623fd89768a9285e9816e36778e565b6f27055f2a586a58f19d6d880de5446d263c4 color_prompt
+ff94cd77c79a523b79f18ddb6df5d489bd78879e63f2916c0584bf5177cace702663986bd366cbdfdbd9da950a6f32fb21037cab8d43658e892818f02dfae297 locale
bfe947bdd69e7d93b32c8cb4e2cabe5717cb6c1e1f49a74015ac2cfb13e96d1f12c4be23ae93a1d61aaa3760d33a032fa9bd99f227fb21223a76b5f5908acc65 aliases.conf
0b93db8ba1b5d16b2c23f9b6daea27a3a76c059a1f5ea0369af526ea3f4ff92a6040face89e95c45cf7daaa7a663f229df0f6c1ba24073ef4b2f7b74b298fdae blacklist.conf
49109d434b577563849c43dd8141961ca798dada74d4d3f49003dac1911f522c43438b8241fa254e4faacdd90058f4d39a7d69b1f493f6d57422c1f706547c95 i386.conf
@@ -219,6 +224,6 @@ bfe947bdd69e7d93b32c8cb4e2cabe5717cb6c1e1f49a74015ac2cfb13e96d1f12c4be23ae93a1d6
abb391a9b5c2b418ad9ea15dcc373a0a0946e5e438d371d00d4bd6c8c60fa81613429a3b8d4313970dcc7eae527793a874c31a9b5a62706f450ab9bb9e8db405 group
fdab6f8fec2a556ab817d90a73635a927ea04dbc4e0470ed59ee6a62c87393f9534c9b746b09a776d938c25b8af9c9fb1686578e24f8307d1d074921ade1bdc7 inittab
06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290 passwd
-b0c2adfae99a949b6a2d06c8a9b2296283af07e793961bf18be1256612e6ba5af61e82154f7654c4dbd02b6f4bfb9009c779b863913d0dae52db9a3b9a32635e profile
+424a3dc91b9ff056c55b49fbbf7100b1a3707603f91410c5846ab869bdf6fb72287481b1ee78ef07e7b9e20a35310118d5fdbcc96e1bbb2fc5e9b2e0583b8a1c profile
f1548a2b5a107479446f15905f0f2fbf8762815b2215188d49d905c803786d35de6d98005dc0828fb2486b04aaa356f1216a964befddf1e72cb169656e23b6ac protocols
cecfc06b1f455d65b0c54a5651e601298b455771333e39d0109eeffd7ebd8d81b7738738eb647e6d3076230b6f3707782b83662ea3764ec33dc5e0b3453d3965 services"
diff --git a/main/alpine-baselayout/locale b/main/alpine-baselayout/locale
new file mode 100644
index 0000000000..0b29557277
--- /dev/null
+++ b/main/alpine-baselayout/locale
@@ -0,0 +1,3 @@
+CHARSET=UTF-8
+LANG=C.UTF-8
+LC_COLLATE=C
diff --git a/main/alpine-baselayout/profile b/main/alpine-baselayout/profile
index 1b5b2777b4..f76472ce23 100644
--- a/main/alpine-baselayout/profile
+++ b/main/alpine-baselayout/profile
@@ -1,5 +1,3 @@
-export CHARSET=UTF-8
-export LANG=C.UTF-8
export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
export PAGER=less
export PS1='\h:\w\$ '