Skip to contentSkip to conversation

fix oelint.bbclass and HOMEPAGE

PATCH New Robert Yang 1 participant 6 messages Mar 19, 2015

lore
Share & tools
lore

Robert Yang

author
#0 lore raw

cover fix oelint.bbclass and HOMEPAGE

The following changes since commit 0752c79282b1cc9699743e719518e6c341d50a3a:

systemd: fix /var/log/journal ownership (2015-03-16 17:38:51 +0000)

are available in the git repository at:

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

Robert Yang (5):
oelint.bbclass: adjust task order
oelint.bbclass: remove duplicated code
gawk: fix HOMEPAGE
groff: fix HOMEPAGE
tzdata: fix HOMEPAGE

 meta/classes/oelint.bbclass                 |   19 +++++++++----------
 meta/recipes-extended/gawk/gawk_4.1.1.bb    |    2 +-
 meta/recipes-extended/groff/groff_1.22.2.bb |    2 +-
 meta/recipes-extended/tzdata/tzdata.inc     |    2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/5 oelint.bbclass: adjust task order

Addtask lint before do_build rather than do_fetch, otherwise it would cause all the tasks after do_fetch run again every time since do_lint[nostamp] = "1".

Signed-off-by Robert Yang <[email protected]>
---
 meta/classes/oelint.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/oelint.bbclass +1 -1
index d00f468..1cee4b0 100644
@@ -1,4 +1,4 @@
-addtask lint before do_fetch
+addtask lint before do_build
 do_lint[nostamp] = "1"
 python do_lint() {
     pkgname = d.getVar("PN", True)
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/5 oelint.bbclass: remove duplicated code

In reply to Robert Yang

The old code 'if not srcpath.find("{PN}") == -1:' looks strange, use 'if srcpath.find("{PN}") != -1:' and remove duplicated code.

Signed-off-by Robert Yang <[email protected]>
---
 meta/classes/oelint.bbclass |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
meta/classes/oelint.bbclass +8 -9
index 1cee4b0..3e01503 100644
@@ -54,6 +54,12 @@ python do_lint() {
         f.close()
         return ret
 
+    def checkPN(pkgname, varname, str):
+        if str.find("{PN}") != -1:
+            bb.warn("%s: should use BPN instead of PN in %s" % (pkgname, varname))
+        if str.find("{P}") != -1:
+            bb.warn("%s: should use BP instead of P in %s" % (pkgname, varname))
+
     length = len("file://")
     for item in srcuri:
         if item.startswith("file://"):

@@ -72,14 +78,7 @@ python do_lint() {
     #
     for s in srcuri:
         if not s.startswith("file://"):
-            if not s.find("{PN}") == -1:
-                bb.warn("%s: should use BPN instead of PN in SRC_URI" % pkgname)
-            if not s.find("{P}") == -1:
-                bb.warn("%s: should use BP instead of P in SRC_URI" % pkgname)
+            checkPN(pkgname, 'SRC_URI', s)
 
-    srcpath = d.getVar("S")
-    if not srcpath.find("{PN}") == -1:
-        bb.warn("%s: should use BPN instead of PN in S" % pkgname)
-    if not srcpath.find("{P}") == -1:
-        bb.warn("%s: should use BP instead of P in S" % pkgname)
+    checkPN(pkgname, 'S', d.getVar('S'))
 }
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH 3/5 gawk: fix HOMEPAGE

In reply to Robert Yang
Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-extended/gawk/gawk_4.1.1.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/gawk/gawk_4.1.1.bb +1 -1
index 3266f58..0a1811b 100644
@@ -2,7 +2,7 @@ SUMMARY = "GNU awk text processing utility"
 DESCRIPTION = "The GNU version of awk, a text processing utility. \
 Awk interprets a special-purpose programming language to do \
 quick and easy text pattern matching and reformatting jobs."
-HOMEPAGE = "www.gnu.org/software/gawk"
+HOMEPAGE = "https://www.gnu.org/software/gawk/"
 BUGTRACKER  = "[email protected]"
 SECTION = "console/utils"
Signature · 1 line
1.7.9.5
author
#4 lore raw

PATCH 4/5 groff: fix HOMEPAGE

In reply to Robert Yang
Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-extended/groff/groff_1.22.2.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/groff/groff_1.22.2.bb +1 -1
index 63f0425..6e84587 100644
@@ -2,7 +2,7 @@ SUMMARY = "GNU Troff software"
 DESCRIPTION = "The groff (GNU troff) software is a typesetting package which reads plain text mixed with \
 formatting commands and produces formatted output."
 SECTION = "base"
-HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
+HOMEPAGE = "http://www.gnu.org/software/groff/"
 LICENSE = "GPLv3"
 PR = "r1"
Signature · 1 line
1.7.9.5
author
#5 lore raw

PATCH 5/5 tzdata: fix HOMEPAGE

In reply to Robert Yang
Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-extended/tzdata/tzdata.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/tzdata/tzdata.inc +1 -1
index f13a4fe..37ae926 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "Timezone data"
-HOMEPAGE = "ftp://elsie.nci.nih.gov/pub/"
+HOMEPAGE = "http://www.iana.org/time-zones"
 SECTION = "base"
 LICENSE = "PD & BSD"
 LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=996a9811747aa48db91ed239e5b355a1"
Signature · 1 line
1.7.9.5