Skip to contentSkip to conversation

insane.bbclass: ignore ipkg/dpkg's CONTROL dir

PATCH In review Robert Yang 1 participant 3 messages Jan 19, 2016

lore
Share & tools
lore
#0 lore raw

cover insane.bbclass: ignore ipkg/dpkg's CONTROL dir

The following changes since commit aafe22fb5f2f58e1e7206a34f410e9cae0d3cfe3:

e2fsprogs: fix PV (2016-01-19 08:53:02 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/ipk
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/ipk

Robert Yang (1):
insane.bbclass: ignore ipkg/dpkg's CONTROL dir

 meta/classes/insane.bbclass |    4 ++++
 1 file changed, 4 insertions(+)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 insane.bbclass: ignore ipkg/dpkg's CONTROL dir

Fixed race issue when:
WARN_QA_append = " buildpaths"
PACKAGE_CLASSES = "package_ipk"

$ bitbake e2fsprogs

[snip]
*** 0595: with open(path) as f:
0596: file_content = f.read()
0597: if tmpdir in file_content:
0598: messages["buildpaths"] = "File %s in package contained reference to tmpdir" % package_qa_clean_path(path,d)
0599:
Exception: IOError: [Errno 2] No such file or directory: '/path/to/tmp/work/core2-64-poky-linux/e2fsprogs/1.42.9-r0/packages-split/e2fsprogs-ptest/CONTROL/control'

The similar to package_deb.

---
 meta/classes/insane.bbclass |    4 ++++
 1 file changed, 4 insertions(+)
meta/classes/insane.bbclass +4 -0
index ba9c651..c16e6ad 100644
@@ -584,6 +584,10 @@ def package_qa_check_buildpaths(path, name, d, elf, messages):
     if os.path.islink(path):
         return
 
+    # Ignore ipk and deb's CONTROL dir
+    if path.find(name + "/CONTROL/") != -1 or path.find(name + "/DEBIAN/") != -1:
+        return
+
     tmpdir = d.getVar('TMPDIR', True)
     with open(path) as f:
         file_content = f.read()
Signature · 1 line
1.7.9.5
#2 lore raw

Re: [PATCH 1/1] insane.bbclass:buildpaths: ignore ipkg/dpkg's CONTROL dir

Update the subjected line a little in the repo:

insane.bbclass:buildpaths: ignore ipkg/dpkg's CONTROL dir

git://git.openembedded.org/openembedded-core-contrib rbt/ipk
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/ipk

Robert Yang (1):
insane.bbclass:buildpaths: ignore ipkg/dpkg's CONTROL dir

* Changes, added ":buildpaths" which is more accurate.

// Robert

Quoted 36 lines · Robert Yang

Fixed race issue when:
WARN_QA_append = " buildpaths"
PACKAGE_CLASSES = "package_ipk"

$ bitbake e2fsprogs

[snip]
*** 0595: with open(path) as f:
0596: file_content = f.read()
0597: if tmpdir in file_content:
0598: messages["buildpaths"] = "File %s in package contained reference to tmpdir" % package_qa_clean_path(path,d)
0599:
Exception: IOError: [Errno 2] No such file or directory: '/path/to/tmp/work/core2-64-poky-linux/e2fsprogs/1.42.9-r0/packages-split/e2fsprogs-ptest/CONTROL/control'

The similar to package_deb.

---
  meta/classes/insane.bbclass |    4 ++++
  1 file changed, 4 insertions(+)
meta/classes/insane.bbclass +4 -0
index ba9c651..c16e6ad 100644
@@ -584,6 +584,10 @@ def package_qa_check_buildpaths(path, name, d, elf, messages):
      if os.path.islink(path):
          return
 
+    # Ignore ipk and deb's CONTROL dir
+    if path.find(name + "/CONTROL/") != -1 or path.find(name + "/DEBIAN/") != -1:
+        return
+
      tmpdir = d.getVar('TMPDIR', True)
      with open(path) as f:
          file_content = f.read()