|
 |
80ddfa2 |
From 2dcebe667a4cbebe0c825633510c015143d5ed92 Mon Sep 17 00:00:00 2001
|
|
|
80ddfa2 |
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
80ddfa2 |
Date: Wed, 27 Jun 2018 11:50:38 +0200
|
|
|
80ddfa2 |
Subject: [PATCH] build: drop install -o/-g root
|
|
|
80ddfa2 |
|
|
|
80ddfa2 |
Calling /usr/bin/install with -o/-g will attempt to chown, and fail
|
|
|
80ddfa2 |
if unsuccessful, which makes an unprivileged install with DESTDIR a
|
|
|
80ddfa2 |
futile attempt always.
|
|
|
80ddfa2 |
|
|
|
80ddfa2 |
Drop it, because /usr/bin/install chowns to the current running user
|
|
|
80ddfa2 |
*anyway*, which means when root calls `make install`, it will do the
|
|
|
80ddfa2 |
right thing as before.
|
|
|
80ddfa2 |
|
|
|
80ddfa2 |
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
80ddfa2 |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
80ddfa2 |
---
|
|
|
80ddfa2 |
Makefile | 24 ++++++++++++------------
|
|
|
80ddfa2 |
1 file changed, 12 insertions(+), 12 deletions(-)
|
|
|
80ddfa2 |
|
|
|
80ddfa2 |
diff --git a/Makefile b/Makefile
|
|
|
80ddfa2 |
index c1106a4e08345..79ee167e0258b 100644
|
|
|
80ddfa2 |
--- a/Makefile
|
|
|
80ddfa2 |
+++ b/Makefile
|
|
|
80ddfa2 |
@@ -157,31 +157,31 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\//\\\//g')
|
|
 |
d85d9ec |
scripts: ebtables-save ebtables.sysv ebtables-config
|
|
|
d85d9ec |
cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
|
|
|
d85d9ec |
mkdir -p $(DESTDIR)$(BINDIR)
|
|
|
d85d9ec |
- install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
|
|
|
d85d9ec |
+ install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
|
|
|
d85d9ec |
cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
|
|
|
d85d9ec |
if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi
|
|
|
d85d9ec |
- if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi
|
|
|
d85d9ec |
+ if test -d $(DESTDIR)$(INITDIR); then install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi
|
|
|
d85d9ec |
cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
|
|
|
d85d9ec |
if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(SYSCONFIGDIR); fi
|
|
|
d85d9ec |
- if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi
|
|
|
d85d9ec |
+ if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi
|
|
|
d85d9ec |
rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
|
|
|
d85d9ec |
|
|
|
d85d9ec |
tmp4:=$(shell printf $(LOCKFILE) | sed 's/\//\\\//g')
|
|
|
d85d9ec |
$(MANDIR)/man8/ebtables.8: ebtables.8
|
|
|
d85d9ec |
mkdir -p $(DESTDIR)$(@D)
|
|
|
d85d9ec |
sed -e 's/$$(VERSION)/$(PROGVERSION)/' -e 's/$$(DATE)/$(PROGDATE)/' -e 's/$$(LOCKFILE)/$(tmp4)/' ebtables.8 > ebtables.8_
|
|
|
d85d9ec |
- install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
|
|
|
d85d9ec |
+ install -m 0644 ebtables.8_ $(DESTDIR)$@
|
|
|
d85d9ec |
rm -f ebtables.8_
|
|
|
d85d9ec |
|
|
|
d85d9ec |
$(DESTDIR)$(ETHERTYPESFILE): ethertypes
|
|
|
d85d9ec |
mkdir -p $(@D)
|
|
|
d85d9ec |
- install -m 0644 -o root -g root $< $@
|
|
|
d85d9ec |
+ install -m 0644 $< $@
|
|
|
d85d9ec |
|
|
|
d85d9ec |
.PHONY: exec
|
|
|
d85d9ec |
exec: ebtables ebtables-restore
|
|
|
d85d9ec |
mkdir -p $(DESTDIR)$(BINDIR)
|
|
|
d85d9ec |
- install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
|
|
|
d85d9ec |
- install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
|
|
|
d85d9ec |
+ install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
|
|
|
d85d9ec |
+ install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
|
|
|
d85d9ec |
|
|
|
d85d9ec |
.PHONY: install
|
|
|
d85d9ec |
install: $(MANDIR)/man8/ebtables.8 $(DESTDIR)$(ETHERTYPESFILE) exec scripts
|
|
|
d85d9ec |
@@ -205,18 +205,18 @@ release:
|
|
|
d85d9ec |
rm -f extensions/ebt_inat.c
|
|
|
d85d9ec |
rm -rf $(CVSDIRS)
|
|
|
d85d9ec |
mkdir -p include/linux/netfilter_bridge
|
|
|
d85d9ec |
- install -m 0644 -o root -g root \
|
|
|
d85d9ec |
+ install -m 0644 \
|
|
|
d85d9ec |
$(KERNEL_INCLUDES)/linux/netfilter_bridge.h include/linux/
|
|
|
d85d9ec |
# To keep possible compile error complaints about undefined ETH_P_8021Q
|
|
|
d85d9ec |
# off my back
|
|
|
d85d9ec |
- install -m 0644 -o root -g root \
|
|
|
d85d9ec |
+ install -m 0644 \
|
|
|
d85d9ec |
$(KERNEL_INCLUDES)/linux/if_ether.h include/linux/
|
|
|
d85d9ec |
- install -m 0644 -o root -g root \
|
|
|
d85d9ec |
+ install -m 0644 \
|
|
|
d85d9ec |
$(KERNEL_INCLUDES)/linux/types.h include/linux/
|
|
|
d85d9ec |
- install -m 0644 -o root -g root \
|
|
|
d85d9ec |
+ install -m 0644 \
|
|
|
d85d9ec |
$(KERNEL_INCLUDES)/linux/netfilter_bridge/*.h \
|
|
|
d85d9ec |
include/linux/netfilter_bridge/
|
|
|
d85d9ec |
- install -m 0644 -o root -g root \
|
|
|
d85d9ec |
+ install -m 0644 \
|
|
|
d85d9ec |
include/ebtables.h include/linux/netfilter_bridge/
|
|
|
d85d9ec |
make clean
|
|
|
d85d9ec |
touch *
|
|
|
80ddfa2 |
--
|
|
|
80ddfa2 |
2.21.0
|
|
|
80ddfa2 |
|