Drop patch for issue fixed upstream.
Change additional source copying to be a part of do_configure
to allow automated upgrades.
Signed-off-by: Alexander Kanavin <a...@linutronix.de>
---
.../at/at/fix_parallel_build_error.patch | 37 -------------------
.../at/{at_3.2.2.bb => at_3.2.4.bb} | 24 ++++++------
2 files changed, 11 insertions(+), 50 deletions(-)
delete mode 100644 meta/recipes-extended/at/at/fix_parallel_build_error.patch
rename meta/recipes-extended/at/{at_3.2.2.bb => at_3.2.4.bb} (81%)
diff --git a/meta/recipes-extended/at/at/fix_parallel_build_error.patch
b/meta/recipes-extended/at/at/fix_parallel_build_error.patch
deleted file mode 100644
index e4f32b82b6..0000000000
--- a/meta/recipes-extended/at/at/fix_parallel_build_error.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 24ef2a6544f9c7ec01bc7ae73dffa2974a1e251d Mon Sep 17 00:00:00 2001
-From: Chen Qi <qi.c...@windriver.com>
-Date: Wed, 5 Dec 2018 09:46:22 +0800
-Subject: [PATCH] fix parallel build error
-
-make -j was failing sometimesa like this
-| ccache i586-poky-linux-gcc -march=i586
--sysroot=/home/nitin/build/build0/tmp/sysroots/i586-poky-linux -I.
-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb
-feliminate-unused-debug-types -o atd atd.o daemon.o -lfl -lpam -Wl,-O1
-Wl,--as-needed
-| parsetime.l:5:19: fatal error: y.tab.h: No such file or directory
-| compilation terminated.
-| make: *** [lex.yy.o] Error 1
-| make: *** Waiting for unfinished jobs....
-
-Fixed the issue by adding a dependency in the makefile.
-Nitin <nitin.a.kam...@intel.com>
-2010/09/02
-
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.gar...@intel.com>
-Signed-off-by: Chen Qi <qi.c...@windriver.com>
----
- Makefile.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-Index: at-3.2.1/Makefile.in
-===================================================================
---- at-3.2.1.orig/Makefile.in
-+++ at-3.2.1/Makefile.in
-@@ -83,6 +83,8 @@ y.tab.c y.tab.h: parsetime.y
- lex.yy.c: parsetime.l
- $(LEX) -i parsetime.l
-
-+parsetime.l: y.tab.h
-+
- atd.service: atd.service.in
- cat $< | sed -e 's![@]sbindir[@]!$(sbindir)!g' | sed -e
's![@]atjobdir[@]!$(atjobdir)!g' > $@
-
diff --git a/meta/recipes-extended/at/at_3.2.2.bb
b/meta/recipes-extended/at/at_3.2.4.bb
similarity index 81%
rename from meta/recipes-extended/at/at_3.2.2.bb
rename to meta/recipes-extended/at/at_3.2.4.bb
index 14b9dace2a..af8c3d6b4c 100644
--- a/meta/recipes-extended/at/at_3.2.2.bb
+++ b/meta/recipes-extended/at/at_3.2.4.bb
@@ -23,21 +23,20 @@ RCONFLICTS:${PN} = "atd"
RREPLACES:${PN} = "atd"
SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \
- file://fix_parallel_build_error.patch \
- file://posixtm.c \
- file://posixtm.h \
- file://file_replacement_with_gplv2.patch \
- file://atd.init \
- file://atd.service \
- ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
- file://makefile-fix-parallel.patch \
- file://0001-remove-glibc-assumption.patch \
- "
+ file://posixtm.c \
+ file://posixtm.h \
+ file://file_replacement_with_gplv2.patch \
+ file://atd.init \
+ file://atd.service \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}',
'', d)} \
+ file://makefile-fix-parallel.patch \
+ file://0001-remove-glibc-assumption.patch \
+ "
PAM_SRC_URI = "file://pam.conf.patch \
file://configure-add-enable-pam.patch"
-SRC_URI[sha256sum] =
"2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088"
+SRC_URI[sha256sum] =
"76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684"
EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
--with-daemon_username=root \
@@ -53,10 +52,9 @@ INITSCRIPT_PARAMS = "defaults"
SYSTEMD_SERVICE:${PN} = "atd.service"
-copy_sources() {
+do_configure:prepend() {
cp -f ${WORKDIR}/posixtm.[ch] ${S}
}
-do_patch[postfuncs] += "copy_sources"
do_install () {
oe_runmake -e "IROOT=${D}" install
--
2.20.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161236):
https://lists.openembedded.org/g/openembedded-core/message/161236
Mute This Topic: https://lists.openembedded.org/mt/88865288/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
