From 7d2bc0c6bba2905dc60d35e916500117930cff2d Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Tue, 8 Dec 2015 15:31:59 +0100 Subject: [PATCH 1/2] archlinux: fix invalid systemd path in make install directive --- archlinux/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 24a387b..c19c404 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -71,7 +71,7 @@ package() { (cd qrexec; make install DESTDIR=$pkgdir SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib) - make install-vm DESTDIR=$pkgdir SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib DROPIN_DIR=usr/lib/systemd/system DIST=archlinux + make install-vm DESTDIR=$pkgdir SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib DROPIN_DIR=usr/lib/systemd DIST=archlinux # Remove things non wanted in archlinux rm -r $pkgdir/etc/yum* From 33aa1782ca5413352936511491a49994f8f4ebcd Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Tue, 8 Dec 2015 15:32:30 +0100 Subject: [PATCH 2/2] archlinux: remove quotes when checking system locales (in case it has been user defined) --- archlinux/PKGBUILD.install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install index bb51d26..f5b6da4 100644 --- a/archlinux/PKGBUILD.install +++ b/archlinux/PKGBUILD.install @@ -135,7 +135,8 @@ EOF echo "LANG=en_US.UTF-8" >> /etc/locale.conf fi # ... and make sure it is really generated - current_locale=`grep LANG /etc/locale.conf|cut -f 2 -d =` + # This line is buggy as LANG can be set to LANG="en_US.UTF-8". The Quotes must be stripped + current_locale=`grep LANG /etc/locale.conf|cut -f 2 -d = | tr -d '"'` if [ -n "$current_locale" ] && ! locale -a | grep -q "$current_locale"; then base=`echo "$current_locale" | cut -f 1 -d .` charmap=`echo "$current_locale.UTF-8" | cut -f 2 -d .`