paxctl: Fix do_package QA Issue.

After usrmerge had been enabled, paxctl has the fowllowing error:
ERROR: paxctl-0.9-r0 do_package: QA Issue: paxctl: Files/directories were installed but not shipped in any package:
  /sbin/paxctl

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Lei Maohui
2023-09-01 09:20:10 +08:00
committed by Armin Kuster
parent 8a91e5e9d1
commit 830817cc14
2 changed files with 29 additions and 1 deletions

View File

@@ -0,0 +1,26 @@
From 824c5d7b96aeef1b4e182f657ac002bed6e14cd5 Mon Sep 17 00:00:00 2001
From: Lei Maohui <leimaohui@fujitsu.com>
Date: Thu, 31 Aug 2023 08:20:56 +0000
Subject: [PATCH] To fix package error if DESTDIR is set to /usr.
Upstream-Status: Inappropriate
Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 0d7bc0c..46fd664 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ $(PROG).o: $(PROG).c $(PROG).h $(PROG)-elf.c
install: $(PROG)
# $(MKDIR) $(DESTDIR)/sbin $(DESTDIR)$(MANDIR)
- $(INSTALL) -D --owner 0 --group 0 --mode a=rx $(PROG) $(DESTDIR)/sbin/$(PROG)
+ $(INSTALL) -D --owner 0 --group 0 --mode a=rx $(PROG) $(DESTDIR)/usr/sbin/$(PROG)
$(INSTALL) -D --owner 0 --group 0 --mode a=r $(PROG).1 $(DESTDIR)/$(MANDIR)/$(PROG).1
clean:
--
2.34.1

View File

@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://paxctl.c;beginline=1;endline=5;md5=0ddd065c61020dda79
file://paxctl-elf.c;beginline=1;endline=5;md5=99f453ce7f6d1687ee808982e2924813 \
"
SRC_URI = "http://pax.grsecurity.net/${BP}.tar.gz"
SRC_URI = "http://pax.grsecurity.net/${BP}.tar.gz \
file://0001-To-fix-package-error-if-DESTDIR-is-set-to-usr.patch \
"
SRC_URI[md5sum] = "9bea59b1987dc4e16c2d22d745374e64"
SRC_URI[sha256sum] = "a330ddd812688169802a3ba29e5e3b19956376b8f6f73b8d7e9586eb04423c2e"