summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorYurii Kolesnykov2019-07-31 23:52:35 +0300
committerYurii Kolesnykov2019-07-31 23:52:35 +0300
commit396c806a06050e0aee02acb86b263b9a7fbd021c (patch)
tree99002a2850c07850e05b5662f29fbddb8599585b /PKGBUILD
parente4b971770e1c69485c348832249c2b4c29daeef0 (diff)
downloadaur-396c806a06050e0aee02acb86b263b9a7fbd021c.tar.gz
remove /usr/share/factory/etc/issue
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD12
1 files changed, 6 insertions, 6 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 9eac3f54b88..70cca4fb64e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=systemd-git
_pkgbase=systemd
pkgname=('systemd-git' 'systemd-libs-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git')
pkgdesc="systemd (git version)"
-pkgver=242.756
+pkgver=243.rc1.r14.gcd826afaf3
pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
@@ -65,11 +65,8 @@ prepare() {
pkgver() {
cd "$_pkgbase"
-
- local _version _count
- _version="$(git describe --abbrev=0 --tags)"
- _count="$(git rev-list --count ${_version}..)"
- printf '%s.%s' "${_version#v}" "${_count}"
+ # cutting off 'foo-' prefix that presents in the git tag
+ git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
@@ -172,6 +169,9 @@ package_systemd-git() {
rm -f "$pkgdir"/usr/share/factory/etc/nsswitch.conf
sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf
+ # avoid a conflict with [core]/filesystem
+ rm -f "$pkgdir"/usr/share/factory/etc/issue
+
# add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat
install -m0644 $_pkgbase/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d