Skip to contentSkip to conversation

Remove wildcard from SRC_URI

PATCH Superseded Mark Hatle 1 participant 3 messages Feb 20, 2013

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover Remove wildcard from SRC_URI

This patch set removes the wild cards from the SRC_URI of both libpam and the man recipes.

When FILESEXTRAPATHS is used in a bbappend file to add extra search paths, bitbake's fetch2 unpack() doesn't properly handle a wildcard when used in the SRC_URI field of the original recipe's bb file.

We can unpack failures, I've even seen a report of a fetch failure. We resolve this by avoiding wild cards in SRC_URI!

I have verified that both before and after the change, the contents of the source code and other components in these recipes are the same.

I suggest that we make wildcards in the SRC_URI field illegal, either via a sanity check or within bitbake itself.

author
#1 lore raw

PATCH 1/2 man: Remove wildcard from SRC_URI

[ CQID: WIND00402802 ]

Remove the wildcard from the SRC_URI. This causes problems when you .bbappend and add a FILESEXTRAPATHS entry. The unpack task may be unable to find the files to unpack leading to an error.

Avoid wildcards at all costs...

Note, remove both man-1.5m2-multiple.patch and man-1.6e-lzma+xz-support.patch, they were not being applied in the previous version. The later also fails to apply when added to the SRC_URI.

---
 .../man/man/man-1.5m2-multiple.patch               |  22 ----
 .../man/man/man-1.6e-lzma+xz-support.patch         | 124 ---------------------
 meta/recipes-extended/man/man_1.6g.bb              |  47 ++++----
 3 files changed, 25 insertions(+), 168 deletions(-)
 delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-multiple.patch
 delete mode 100644 meta/recipes-extended/man/man/man-1.6e-lzma+xz-support.patch
meta/recipes-extended/man/man/man-1.5m2-multiple.patch deleted +0 -22
deleted file mode 100644
index ec06ab7..0000000
@@ -1,22 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <[email protected]>
-
---- man-1.5m2/src/manfile.c_multiple	2006-12-08 23:42:17.000000000 +0100
-+++ man-1.5m2/src/manfile.c	2006-12-09 00:00:01.000000000 +0100
-@@ -25,9 +25,12 @@
- 
-      if (a) {
- 	  if (*head) {
--	       p = *head;
--	       while(p->next)
--		    p = p->next;
-+		   for (p = *head; p->next; p = p->next) {
-+               if(!strcmp (p->filename, a->filename))
-+					   return;
-+		   }
-+           if(!strcmp (p->filename, a->filename))
-+				  return;
- 	       p->next = a;
- 	  } else
- 	       *head = a;
meta/recipes-extended/man/man/man-1.6e-lzma+xz-support.patch deleted +0 -124

124 lines not on this page · raw message

meta/recipes-extended/man/man_1.6g.bb +25 -22

61 lines not on this page · raw message

Signature · 1 line
1.8.1.2.545.g2f19ada
author
#2 lore raw

PATCH 2/2 libpam: Avoid wildcards in the SRC_URI

In reply to Mark Hatle

[ CQID: WIND00402802 ]

Remove the wildcard from the SRC_URI. This causes problems when you .bbappend and add a FILESEXTRAPATHS entry. The unpack task may be unable to find the files to unpack leading to an error.

Avoid wildcards at all costs...

---
 meta/recipes-extended/pam/libpam_1.1.6.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
meta/recipes-extended/pam/libpam_1.1.6.bb +7 -2
index 93c98c0..011769a 100644
@@ -11,7 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3"
 
 SRC_URI = "http://linux-pam.org/library/Linux-PAM-${PV}.tar.bz2 \
            file://99_pam \
-           file://pam.d/* \
+           file://pam.d/common-account \
+           file://pam.d/common-auth \
+           file://pam.d/common-password \
+           file://pam.d/common-session \
+           file://pam.d/common-session-noninteractive \
+           file://pam.d/other \
            file://libpam-xtests.patch \
            file://destdirfix.patch \
           "
@@ -30,7 +35,7 @@ EXTRA_OECONF = "--with-db-uniquename=_pam \
 
 CFLAGS_append = " -fPIC "
 
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/Linux-PAM-${PV}"
 
Signature · 1 line
1.8.1.2.545.g2f19ada