Skip to contentSkip to conversation

restorecond: Fix consistancy of DESTDIR usage

PATCH Applied Laurent Bigonville 2 participants 3 messages May 31, 2018 – Jun 2, 2018 SELinux security module

lore
Share & tools
lore

Laurent Bigonville

author
#0 lore raw

PATCH 1/1 restorecond: Fix consistancy of DESTDIR usage

From: Laurent Bigonville <[email protected]>

---
 restorecond/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
restorecond/Makefile +7 -7
index 25be18d4..8a0ada1f 100644
@@ -9,8 +9,8 @@ DBUSSERVICEDIR = $(PREFIX)/share/dbus-1/services
 SYSTEMDDIR ?= $(PREFIX)/lib/systemd
 
 autostart_DATA = sealertauto.desktop
-INITDIR ?= $(DESTDIR)/etc/rc.d/init.d
-SELINUXDIR = $(DESTDIR)/etc/selinux
+INITDIR ?= /etc/rc.d/init.d
+SELINUXDIR = /etc/selinux
 
 DBUSFLAGS = -DHAVE_DBUS $(shell $(PKG_CONFIG) --cflags dbus-glib-1)
 DBUSLIB = $(shell $(PKG_CONFIG) --libs dbus-glib-1)

@@ -42,11 +42,11 @@ install: all
 	-mkdir -p $(DESTDIR)$(SBINDIR)
 	install -m 755 restorecond $(DESTDIR)$(SBINDIR)
 	install -m 644 restorecond.8 $(DESTDIR)$(MANDIR)/man8
-	-mkdir -p $(INITDIR)
-	install -m 755 restorecond.init $(INITDIR)/restorecond
-	-mkdir -p $(SELINUXDIR)
-	install -m 644 restorecond.conf $(SELINUXDIR)/restorecond.conf
-	install -m 644 restorecond_user.conf $(SELINUXDIR)/restorecond_user.conf
+	-mkdir -p $(DESTDIR)$(INITDIR)
+	install -m 755 restorecond.init $(DESTDIR)$(INITDIR)/restorecond
+	-mkdir -p $(DESTDIR)$(SELINUXDIR)
+	install -m 644 restorecond.conf $(DESTDIR)$(SELINUXDIR)/restorecond.conf
+	install -m 644 restorecond_user.conf $(DESTDIR)$(SELINUXDIR)/restorecond_user.conf
 	-mkdir -p $(DESTDIR)$(AUTOSTARTDIR)
 	install -m 644 restorecond.desktop $(DESTDIR)$(AUTOSTARTDIR)/restorecond.desktop
 	-mkdir -p $(DESTDIR)$(DBUSSERVICEDIR)
Signature · 1 line
2.17.1
#1 lore raw
Quoted 39 lines · Laurent Bigonville

From: Laurent Bigonville <[email protected]>

---
 restorecond/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
restorecond/Makefile +7 -8
index 25be18d4..8a0ada1f 100644
@@ -9,8 +9,8 @@ DBUSSERVICEDIR = $(PREFIX)/share/dbus-1/services
 SYSTEMDDIR ?= $(PREFIX)/lib/systemd
 
 autostart_DATA = sealertauto.desktop
-INITDIR ?= $(DESTDIR)/etc/rc.d/init.d
-SELINUXDIR = $(DESTDIR)/etc/selinux
+INITDIR ?= /etc/rc.d/init.d
+SELINUXDIR = /etc/selinux
 
 DBUSFLAGS = -DHAVE_DBUS $(shell $(PKG_CONFIG) --cflags dbus-glib-1)
 DBUSLIB = $(shell $(PKG_CONFIG) --libs dbus-glib-1)

@@ -42,11 +42,11 @@ install: all
        -mkdir -p $(DESTDIR)$(SBINDIR)
        install -m 755 restorecond $(DESTDIR)$(SBINDIR)
        install -m 644 restorecond.8 $(DESTDIR)$(MANDIR)/man8
-       -mkdir -p $(INITDIR)
-       install -m 755 restorecond.init $(INITDIR)/restorecond
-       -mkdir -p $(SELINUXDIR)
-       install -m 644 restorecond.conf $(SELINUXDIR)/restorecond.conf
-       install -m 644 restorecond_user.conf $(SELINUXDIR)/restorecond_user.conf
+       -mkdir -p $(DESTDIR)$(INITDIR)
+       install -m 755 restorecond.init $(DESTDIR)$(INITDIR)/restorecond
+       -mkdir -p $(DESTDIR)$(SELINUXDIR)
+       install -m 644 restorecond.conf $(DESTDIR)$(SELINUXDIR)/restorecond.conf
+       install -m 644 restorecond_user.conf $(DESTDIR)$(SELINUXDIR)/restorecond_user.conf
        -mkdir -p $(DESTDIR)$(AUTOSTARTDIR)
        install -m 644 restorecond.desktop $(DESTDIR)$(AUTOSTARTDIR)/restorecond.desktop
        -mkdir -p $(DESTDIR)$(DBUSSERVICEDIR)
--
Quoted 1 line

2.17.1

Thanks for the new patch! I was not requiring a new version of the patch, but this one looks good to me (I "ack" it). I would like to give some time for other developers and package maintainers to comment on this patch (at least a day), in case we missed something obvious which would break with it, so I plan to merge it tomorrow of this week-end.

Cheers,
Nicolas

Applied
#2 lore raw
Quoted 49 lines · Nicolas Iooss
Quoted 39 lines · Laurent Bigonville

From: Laurent Bigonville <[email protected]>

---
 restorecond/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
restorecond/Makefile +7 -8
index 25be18d4..8a0ada1f 100644
@@ -9,8 +9,8 @@ DBUSSERVICEDIR = $(PREFIX)/share/dbus-1/services
 SYSTEMDDIR ?= $(PREFIX)/lib/systemd
 
 autostart_DATA = sealertauto.desktop
-INITDIR ?= $(DESTDIR)/etc/rc.d/init.d
-SELINUXDIR = $(DESTDIR)/etc/selinux
+INITDIR ?= /etc/rc.d/init.d
+SELINUXDIR = /etc/selinux
 
 DBUSFLAGS = -DHAVE_DBUS $(shell $(PKG_CONFIG) --cflags dbus-glib-1)
 DBUSLIB = $(shell $(PKG_CONFIG) --libs dbus-glib-1)

@@ -42,11 +42,11 @@ install: all
        -mkdir -p $(DESTDIR)$(SBINDIR)
        install -m 755 restorecond $(DESTDIR)$(SBINDIR)
        install -m 644 restorecond.8 $(DESTDIR)$(MANDIR)/man8
-       -mkdir -p $(INITDIR)
-       install -m 755 restorecond.init $(INITDIR)/restorecond
-       -mkdir -p $(SELINUXDIR)
-       install -m 644 restorecond.conf $(SELINUXDIR)/restorecond.conf
-       install -m 644 restorecond_user.conf $(SELINUXDIR)/restorecond_user.conf
+       -mkdir -p $(DESTDIR)$(INITDIR)
+       install -m 755 restorecond.init $(DESTDIR)$(INITDIR)/restorecond
+       -mkdir -p $(DESTDIR)$(SELINUXDIR)
+       install -m 644 restorecond.conf $(DESTDIR)$(SELINUXDIR)/restorecond.conf
+       install -m 644 restorecond_user.conf $(DESTDIR)$(SELINUXDIR)/restorecond_user.conf
        -mkdir -p $(DESTDIR)$(AUTOSTARTDIR)
        install -m 644 restorecond.desktop $(DESTDIR)$(AUTOSTARTDIR)/restorecond.desktop
        -mkdir -p $(DESTDIR)$(DBUSSERVICEDIR)
--
Quoted 1 line

2.17.1

Thanks for the new patch! I was not requiring a new version of the patch, but this one looks good to me (I "ack" it). I would like to give some time for other developers and package maintainers to comment on this patch (at least a day), in case we missed something obvious which would break with it, so I plan to merge it tomorrow of this week-end.

Quoted 2 lines

Cheers,
Nicolas

I have applied all the patches that you sent this week. Thanks!

Nicolas