diff options
author | Lei Maohui <leimaohui@fujitsu.com> | 2023-09-01 09:20:10 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2023-09-08 12:06:31 -0400 |
commit | 830817cc145da0c73204f01bfea891c2271beada (patch) | |
tree | 142c9a7c469fe3d40e60333d0a81d4e106b27ce7 | |
parent | 8a91e5e9d19c692e1eefe546132848bebdbd374b (diff) | |
download | meta-security-830817cc145da0c73204f01bfea891c2271beada.tar.gz |
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>
-rw-r--r-- | recipes-security/paxctl/paxctl/0001-To-fix-package-error-if-DESTDIR-is-set-to-usr.patch | 26 | ||||
-rw-r--r-- | recipes-security/paxctl/paxctl_0.9.bb | 4 |
2 files changed, 29 insertions, 1 deletions
diff --git a/recipes-security/paxctl/paxctl/0001-To-fix-package-error-if-DESTDIR-is-set-to-usr.patch b/recipes-security/paxctl/paxctl/0001-To-fix-package-error-if-DESTDIR-is-set-to-usr.patch new file mode 100644 index 0000000..451cb7f --- /dev/null +++ b/recipes-security/paxctl/paxctl/0001-To-fix-package-error-if-DESTDIR-is-set-to-usr.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 824c5d7b96aeef1b4e182f657ac002bed6e14cd5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@fujitsu.com> | ||
3 | Date: Thu, 31 Aug 2023 08:20:56 +0000 | ||
4 | Subject: [PATCH] To fix package error if DESTDIR is set to /usr. | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | ||
8 | --- | ||
9 | Makefile | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/Makefile b/Makefile | ||
13 | index 0d7bc0c..46fd664 100644 | ||
14 | --- a/Makefile | ||
15 | +++ b/Makefile | ||
16 | @@ -19,7 +19,7 @@ $(PROG).o: $(PROG).c $(PROG).h $(PROG)-elf.c | ||
17 | |||
18 | install: $(PROG) | ||
19 | # $(MKDIR) $(DESTDIR)/sbin $(DESTDIR)$(MANDIR) | ||
20 | - $(INSTALL) -D --owner 0 --group 0 --mode a=rx $(PROG) $(DESTDIR)/sbin/$(PROG) | ||
21 | + $(INSTALL) -D --owner 0 --group 0 --mode a=rx $(PROG) $(DESTDIR)/usr/sbin/$(PROG) | ||
22 | $(INSTALL) -D --owner 0 --group 0 --mode a=r $(PROG).1 $(DESTDIR)/$(MANDIR)/$(PROG).1 | ||
23 | |||
24 | clean: | ||
25 | -- | ||
26 | 2.34.1 | ||
diff --git a/recipes-security/paxctl/paxctl_0.9.bb b/recipes-security/paxctl/paxctl_0.9.bb index 5c9aff1..3d2f2a3 100644 --- a/recipes-security/paxctl/paxctl_0.9.bb +++ b/recipes-security/paxctl/paxctl_0.9.bb | |||
@@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://paxctl.c;beginline=1;endline=5;md5=0ddd065c61020dda79 | |||
8 | file://paxctl-elf.c;beginline=1;endline=5;md5=99f453ce7f6d1687ee808982e2924813 \ | 8 | file://paxctl-elf.c;beginline=1;endline=5;md5=99f453ce7f6d1687ee808982e2924813 \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI = "http://pax.grsecurity.net/${BP}.tar.gz" | 11 | SRC_URI = "http://pax.grsecurity.net/${BP}.tar.gz \ |
12 | file://0001-To-fix-package-error-if-DESTDIR-is-set-to-usr.patch \ | ||
13 | " | ||
12 | 14 | ||
13 | SRC_URI[md5sum] = "9bea59b1987dc4e16c2d22d745374e64" | 15 | SRC_URI[md5sum] = "9bea59b1987dc4e16c2d22d745374e64" |
14 | SRC_URI[sha256sum] = "a330ddd812688169802a3ba29e5e3b19956376b8f6f73b8d7e9586eb04423c2e" | 16 | SRC_URI[sha256sum] = "a330ddd812688169802a3ba29e5e3b19956376b8f6f73b8d7e9586eb04423c2e" |