diff options
author | 2017-10-20 08:30:34 -0400 | |
---|---|---|
committer | 2017-10-20 08:30:34 -0400 | |
commit | 94b7a710948b1f45e5089e2b2207fe31917c0db3 (patch) | |
tree | 8c683eb95338dba4b4584670e7f20b2d69539723 | |
parent | private-lib: fixed make test-private-lib (diff) | |
parent | Simplify deb package naming (diff) | |
download | firejail-94b7a710948b1f45e5089e2b2207fe31917c0db3.tar.gz firejail-94b7a710948b1f45e5089e2b2207fe31917c0db3.tar.zst firejail-94b7a710948b1f45e5089e2b2207fe31917c0db3.zip |
Merge branch 'master' of http://github.com/netblue30/firejail
-rw-r--r-- | etc/gwenview.profile | 2 | ||||
-rw-r--r-- | etc/scribus.profile | 2 | ||||
-rwxr-xr-x | mkdeb.sh | 12 |
3 files changed, 3 insertions, 13 deletions
diff --git a/etc/gwenview.profile b/etc/gwenview.profile index bb67bc933..76b77ef1c 100644 --- a/etc/gwenview.profile +++ b/etc/gwenview.profile | |||
@@ -34,7 +34,7 @@ seccomp | |||
34 | shell none | 34 | shell none |
35 | tracelog | 35 | tracelog |
36 | 36 | ||
37 | private-bin gwenview,kbuildsycoca4,gimp,gimp-2.* | 37 | private-bin gwenview,kbuildsycoca4,gimp* |
38 | private-dev | 38 | private-dev |
39 | # private-etc X11 | 39 | # private-etc X11 |
40 | 40 | ||
diff --git a/etc/scribus.profile b/etc/scribus.profile index dbb83bc09..e07caffe5 100644 --- a/etc/scribus.profile +++ b/etc/scribus.profile | |||
@@ -42,6 +42,6 @@ seccomp | |||
42 | shell none | 42 | shell none |
43 | tracelog | 43 | tracelog |
44 | 44 | ||
45 | # private-bin scribus,gs,gimp,gimp-2.* | 45 | # private-bin scribus,gs,gimp* |
46 | private-dev | 46 | private-dev |
47 | private-tmp | 47 | private-tmp |
@@ -44,16 +44,6 @@ find $INSTALL_DIR -type d | xargs chmod 755 | |||
44 | cd $CODE_DIR | 44 | cd $CODE_DIR |
45 | fakeroot dpkg-deb --build debian | 45 | fakeroot dpkg-deb --build debian |
46 | lintian --no-tag-display-limit debian.deb | 46 | lintian --no-tag-display-limit debian.deb |
47 | arch=$( getconf LONG_BIT ) | 47 | mv debian.deb ../firejail_$2_1_$(dpkg-architecture -qDEB_HOST_ARCH).deb |
48 | if [ $arch = 64 ] | ||
49 | then | ||
50 | mv debian.deb ../firejail_$2_1_amd64.deb | ||
51 | elif [ $arch = 32 ] | ||
52 | then | ||
53 | mv debian.deb ../firejail_$2_1_i386.deb | ||
54 | # Fallback to 64-bit package. | ||
55 | else | ||
56 | mv debian.deb ../firejail_$2_1_amd64.deb | ||
57 | fi | ||
58 | cd .. | 48 | cd .. |
59 | rm -fr $CODE_DIR | 49 | rm -fr $CODE_DIR |