diff options
author | 2020-04-05 10:38:07 +0000 | |
---|---|---|
committer | 2020-04-05 10:38:07 +0000 | |
commit | ab62720b38ffa766b1a51153d167df254148091b (patch) | |
tree | 9e5200646edcca86a8bccf18738c348a11bcfb64 | |
parent | profile fixes (diff) | |
parent | Speedup the buildsystem (diff) | |
download | firejail-ab62720b38ffa766b1a51153d167df254148091b.tar.gz firejail-ab62720b38ffa766b1a51153d167df254148091b.tar.zst firejail-ab62720b38ffa766b1a51153d167df254148091b.zip |
Merge pull request #3317 from rusty-snake/speedup-build
Speedup the buildsystem
-rw-r--r-- | Makefile.in | 9 | ||||
-rwxr-xr-x | mketc.sh | 13 |
2 files changed, 5 insertions, 17 deletions
diff --git a/Makefile.in b/Makefile.in index afe8c9972..61889c017 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -128,13 +128,12 @@ endif | |||
128 | install -c -m 0644 RELNOTES $(DESTDIR)/$(DOCDIR)/. | 128 | install -c -m 0644 RELNOTES $(DESTDIR)/$(DOCDIR)/. |
129 | install -c -m 0644 etc/templates/* $(DESTDIR)/$(DOCDIR)/. | 129 | install -c -m 0644 etc/templates/* $(DESTDIR)/$(DOCDIR)/. |
130 | # etc files | 130 | # etc files |
131 | ./mketc.sh $(sysconfdir) $(BUSYBOX_WORKAROUND) | 131 | ifeq ($(BUSYBOX_WORKAROUND),yes) |
132 | ./mketc.sh | ||
133 | endif | ||
132 | install -m 0755 -d $(DESTDIR)/$(sysconfdir)/firejail | 134 | install -m 0755 -d $(DESTDIR)/$(sysconfdir)/firejail |
133 | for file in .etc/* etc/firejail.config; do \ | 135 | install -m 0644 -t $(DESTDIR)/$(sysconfdir)/firejail etc/{*.profile,*.inc,*.net,firejail.config} |
134 | install -c -m 0644 $$file $(DESTDIR)/$(sysconfdir)/firejail; \ | ||
135 | done | ||
136 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" | 136 | sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" |
137 | rm -fr .etc | ||
138 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) | 137 | ifeq ($(HAVE_APPARMOR),-DHAVE_APPARMOR) |
139 | # install apparmor profile | 138 | # install apparmor profile |
140 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" | 139 | sh -c "if [ ! -d $(DESTDIR)/$(sysconfdir)/apparmor.d ]; then install -d -m 755 $(DESTDIR)/$(sysconfdir)/apparmor.d; fi;" |
@@ -3,16 +3,6 @@ | |||
3 | # Copyright (C) 2014-2020 Firejail Authors | 3 | # Copyright (C) 2014-2020 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | rm -fr .etc | ||
7 | mkdir .etc | ||
8 | |||
9 | for file in etc/*.profile etc/*.inc etc/*.net; | ||
10 | do | ||
11 | sed "s;/etc/firejail;$1/firejail;g" $file > .$file | ||
12 | done | ||
13 | |||
14 | if [ "x$2" = "xyes" ] | ||
15 | then | ||
16 | sed -i -e ' | 6 | sed -i -e ' |
17 | 1i# Workaround for systems where common UNIX utilities are symlinks to busybox.\ | 7 | 1i# Workaround for systems where common UNIX utilities are symlinks to busybox.\ |
18 | # If this is not your case you can remove --enable-busybox-workaround from\ | 8 | # If this is not your case you can remove --enable-busybox-workaround from\ |
@@ -23,5 +13,4 @@ noblacklist \${PATH}/su\ | |||
23 | noblacklist \${PATH}/sudo\ | 13 | noblacklist \${PATH}/sudo\ |
24 | noblacklist \${PATH}/nc\ | 14 | noblacklist \${PATH}/nc\ |
25 | noblacklist \${PATH}/crontab\ | 15 | noblacklist \${PATH}/crontab\ |
26 | ' .etc/disable-common.inc | 16 | ' etc/disable-common.inc |
27 | fi | ||