diff options
| author |   Markus Volk <f_l_k@t-online.de> | 2023-11-24 19:37:41 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2023-11-24 13:46:34 -0800 |
| commit | 304fd6a06e17add7fac0067a32a356874fb247d4 (patch) | |
| tree | 5fc3fa0476c9b439569d803ba23c526a90f20a80 | |
| parent | 45ce72729513da4aaa0033ad767c25ff5840f751 (diff) | |
| download | meta-openembedded-contrib-304fd6a06e17add7fac0067a32a356874fb247d4.tar.gz | |
cups-filters: fix Makefile race condition
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-printing/cups/cups-filters/fix-make-race.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb | 5 |
2 files changed, 37 insertions, 1 deletions
diff --git a/meta-oe/recipes-printing/cups/cups-filters/fix-make-race.patch b/meta-oe/recipes-printing/cups/cups-filters/fix-make-race.patch new file mode 100644 index 0000000000..9a4e31c1d2 --- /dev/null +++ b/meta-oe/recipes-printing/cups/cups-filters/fix-make-race.patch @@ -0,0 +1,33 @@ +From 7aba7c690fd84ca1e48d0cb6829410eeb658c594 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Fri, 24 Nov 2023 17:53:49 +0100 +Subject: [PATCH] Fix a Makefile race condition + +utils/driverless-fax script may be written before utils directory was created + +| make[2]: Entering directory '/home/flk/poky/build/tmp/work/corei7-64-poky-linux/cups-filters/2.0.0/build' +| sed \ +| -e "s|\@CUPS_SERVERBIN\@|/usr/libexec/cups|" \ +| ../cups-filters-2.0.0/utils/driverless-fax.in > utils/driverless-fax +| /bin/bash: line 2: utils/driverless-fax: No such file or directory + +Upstream-Status: Pending +--- + Makefile.am | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +--- a/Makefile.am 2023-09-22 18:14:03.000000000 +0200 ++++ b/Makefile.am 2023-11-24 19:09:09.339653936 +0100 +@@ -62,7 +62,7 @@ + # "driverless" utility + # ==================== + utils/driverless-fax: utils/driverless-fax.in Makefile +- sed \ ++ mkdir -p utils && sed \ + -e "s|\@CUPS_SERVERBIN\@|$(CUPS_SERVERBIN)|" \ + $< > $@ + + + + + diff --git a/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb b/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb index 0370ae79d2..efcd1aab8a 100644 --- a/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb +++ b/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb @@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6d5b952b53dbe7752199903d082e5f07" DEPENDS = "libcupsfilters libppd glib-2.0 poppler" -SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz" +SRC_URI = " \ + https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://fix-make-race.patch \ +" SRC_URI[sha256sum] = "b5152e3dd148ed73835827ac2f219df7cf5808dbf9dbaec2aa0127b44de800d8" inherit autotools gettext pkgconfig github-releases |