diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2023-09-11 15:36:15 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2023-09-11 15:36:15 +0300 |
| commit | 80d41842d41c701edac5b2c768da574f260fa6a3 (patch) | |
| tree | 7d58015c844bd241f3c1737b1af0d4b53dfe8c67 /meta-security/recipes-security/paxctl | |
| parent | fc7e7973f3119e2bad511209aa336537dc5ffbed (diff) | |
| download | openbmc-80d41842d41c701edac5b2c768da574f260fa6a3.tar.xz | |
Revert "subtree updates"
Needs to go through CI
This reverts commit fc7e7973f3119e2bad511209aa336537dc5ffbed.
Diffstat (limited to 'meta-security/recipes-security/paxctl')
| -rw-r--r-- | meta-security/recipes-security/paxctl/paxctl/0001-To-fix-package-error-if-DESTDIR-is-set-to-usr.patch | 26 | ||||
| -rw-r--r-- | meta-security/recipes-security/paxctl/paxctl_0.9.bb | 4 |
2 files changed, 1 insertions, 29 deletions
diff --git a/meta-security/recipes-security/paxctl/paxctl/0001-To-fix-package-error-if-DESTDIR-is-set-to-usr.patch b/meta-security/recipes-security/paxctl/paxctl/0001-To-fix-package-error-if-DESTDIR-is-set-to-usr.patch deleted file mode 100644 index 451cb7f96f..0000000000 --- a/meta-security/recipes-security/paxctl/paxctl/0001-To-fix-package-error-if-DESTDIR-is-set-to-usr.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 diff --git a/meta-security/recipes-security/paxctl/paxctl_0.9.bb b/meta-security/recipes-security/paxctl/paxctl_0.9.bb index 3d2f2a36c4..5c9aff1558 100644 --- a/meta-security/recipes-security/paxctl/paxctl_0.9.bb +++ b/meta-security/recipes-security/paxctl/paxctl_0.9.bb @@ -8,9 +8,7 @@ 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 \ - file://0001-To-fix-package-error-if-DESTDIR-is-set-to-usr.patch \ -" +SRC_URI = "http://pax.grsecurity.net/${BP}.tar.gz" SRC_URI[md5sum] = "9bea59b1987dc4e16c2d22d745374e64" SRC_URI[sha256sum] = "a330ddd812688169802a3ba29e5e3b19956376b8f6f73b8d7e9586eb04423c2e" |