Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/56'

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2015-12-11 15:11:23 +01:00
commit 62c12bd1c6
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archlinux/PKGBUILD
View File

@ -71,7 +71,7 @@ package() {
(cd qrexec; make install DESTDIR=$pkgdir SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib) (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 # Remove things non wanted in archlinux
rm -r $pkgdir/etc/yum* rm -r $pkgdir/etc/yum*

3
archlinux/PKGBUILD.install
View File

@ -135,7 +135,8 @@ EOF
echo "LANG=en_US.UTF-8" >> /etc/locale.conf echo "LANG=en_US.UTF-8" >> /etc/locale.conf
fi fi
# ... and make sure it is really generated # ... 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 if [ -n "$current_locale" ] && ! locale -a | grep -q "$current_locale"; then
base=`echo "$current_locale" | cut -f 1 -d .` base=`echo "$current_locale" | cut -f 1 -d .`
charmap=`echo "$current_locale.UTF-8" | cut -f 2 -d .` charmap=`echo "$current_locale.UTF-8" | cut -f 2 -d .`