summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-11-19 14:25:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-25 17:57:23 +0000
commitb28140ff2f6383fa9c1cabface75e0f2d139cc13 (patch)
tree4947e231a07889b213ff67cf6d6f8c828e7e3771
parent4603d9401c0240847b5f8fccc33a0301ce071a83 (diff)
downloadpoky-b28140ff2f6383fa9c1cabface75e0f2d139cc13.tar.gz
psmisc: remove a patch that is no longer necessary
(From OE-Core rev: 3b1a87d78ba39593fb2a95362a426cf48c3e8a68) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch28
-rw-r--r--meta/recipes-extended/psmisc/psmisc_23.3.bb1
2 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch b/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch
deleted file mode 100644
index 9451303dd7..0000000000
--- a/meta/recipes-extended/psmisc/psmisc/0001-Makefile.am-create-src-directory-before-attempting-t.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From dac375f640fecd45e6254a8d870ee37ec8f41670 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 2 Nov 2017 16:21:22 +0200
4Subject: [PATCH] Makefile.am: create src directory before attempting to write
5 there
6
7Otherwise out of tree builds will fail.
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12---
13 Makefile.am | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/Makefile.am b/Makefile.am
17index 441ae94..882969d 100644
18--- a/Makefile.am
19+++ b/Makefile.am
20@@ -86,7 +86,7 @@ EXTRA_DIST = src/signames.c README.md misc/git-version-gen
21 CLEANFILES = src/signames.h
22
23 src/signames.h: src/signames.c Makefile src/$(am__dirstamp)
24- export LC_ALL=C ; \
25+ export LC_ALL=C ; mkdir -p src ; \
26 @CPP@ -dM $< |\
27 tr -s '\t ' ' ' | sort -n -k 3 | sed \
28 's:#define SIG\([A-Z][A-Z]*[0-9]*\) \([0-9][0-9]*\).*$\:{\ \2,"\1" },:p;d' | \
diff --git a/meta/recipes-extended/psmisc/psmisc_23.3.bb b/meta/recipes-extended/psmisc/psmisc_23.3.bb
index b3c3c7e5a8..e569f1074b 100644
--- a/meta/recipes-extended/psmisc/psmisc_23.3.bb
+++ b/meta/recipes-extended/psmisc/psmisc_23.3.bb
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
4 4
5SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \ 5SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \
6 file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ 6 file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
7 file://0001-Makefile.am-create-src-directory-before-attempting-t.patch \
8 " 7 "
9SRCREV = "78bde849041e6c914a2a517ebe1255b86dc98772" 8SRCREV = "78bde849041e6c914a2a517ebe1255b86dc98772"
10S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"