mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

at: update 3.2.2 -> 3.2.4

Browse Source 
Drop patch for issue fixed upstream.

Change additional source copying to be a part of do_configure
to allow automated upgrades.

(From OE-Core rev: 4c96bed812c4b1371944ad84659a2877a28678d1)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-02-02 19:27:36 +01:00
committed by Richard Purdie
parent 6db7501b6b
commit 3b7fee4468
2 changed files with 11 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/at/at/fix_parallel_build_error.patch
-37
View File
@@ -1,37 +0,0 @@
From 24ef2a6544f9c7ec01bc7ae73dffa2974a1e251d Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@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.kamble@intel.com>
2010/09/02
Upstream-Status: Pending
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Chen Qi <Qi.Chen@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' > $@
meta/recipes-extended/at/at_3.2.2.bb → meta/recipes-extended/at/at_3.2.4.bb
+11 -13
View File
@@ -23,21 +23,20 @@ RCONFLICTS:${PN} = "atd"
RREPLACES:${PN} = "atd" RREPLACES:${PN} = "atd"
SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \ SRC_URI = "http://software.calhariz.com/at/${BPN}_${PV}.orig.tar.gz \
file://fix_parallel_build_error.patch \ file://posixtm.c \
file://posixtm.c \ file://posixtm.h \
file://posixtm.h \ file://file_replacement_with_gplv2.patch \
file://file_replacement_with_gplv2.patch \ file://atd.init \
file://atd.init \ file://atd.service \
file://atd.service \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://makefile-fix-parallel.patch \
file://makefile-fix-parallel.patch \ file://0001-remove-glibc-assumption.patch \
file://0001-remove-glibc-assumption.patch \ "
"
PAM_SRC_URI = "file://pam.conf.patch \ PAM_SRC_URI = "file://pam.conf.patch \
file://configure-add-enable-pam.patch" file://configure-add-enable-pam.patch"
SRC_URI[sha256sum] = "2211da14914fde1f9cc83592838fb6385a32fb11fcecb7816c77700df6559088" SRC_URI[sha256sum] = "76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684"
EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
--with-daemon_username=root \ --with-daemon_username=root \
@@ -53,10 +52,9 @@ INITSCRIPT_PARAMS = "defaults"
SYSTEMD_SERVICE:${PN} = "atd.service" SYSTEMD_SERVICE:${PN} = "atd.service"
copy_sources() { do_configure:prepend() {
cp -f ${WORKDIR}/posixtm.[ch] ${S} cp -f ${WORKDIR}/posixtm.[ch] ${S}
} }
do_patch[postfuncs] += "copy_sources"
do_install () { do_install () {
oe_runmake -e "IROOT=${D}" install oe_runmake -e "IROOT=${D}" install