Fixes for LSB command check

PATCH In review Kang Kai 2 participants 6 messages Apr 27, 2011

lore

Share & tools

lore

Kang Kai

author

2011-04-27 09:29 UTC #0 lore raw

cover Fixes for LSB command check

From: Kang Kai <[email protected]>

Update groff to 1.20.1 from OE
Add commands install_initd and remove_initd in lsbsetup Add xdg-utils into lsb image to provides xdg-* commands.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: kangkai/distro
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/distro

Thanks,
Kang Kai <[email protected]>
---

Kang Kai (3):
groff: update to 1.20.1
lsbsetup: add commands install_initd and remove_initd
task-core-lsb: add xdg-utils into lsb image

 meta/recipes-extended/groff/groff_1.20.1.bb  |   36 ++++++++++++++++++++++++++
 meta/recipes-extended/lsb/lsbsetup_0.9.bb    |    7 ++++-
 meta/recipes-extended/tasks/task-core-lsb.bb |    1 +
 3 files changed, 43 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-extended/groff/groff_1.20.1.bb

Kang Kai

author

2011-04-27 09:29 UTC #1 lore raw

PATCH 1/3 groff: update to 1.20.1

From: Kang Kai <[email protected]>

Update groff to 1.20.1, add SUMMARY and LICENSE info From OE 70bf94cd8669f549ca90581e9592d409b6e24e2e Fixes [Yocto 879]

Signed-off-by Kang Kai <[email protected]>

---
 meta/recipes-extended/groff/groff_1.20.1.bb |   36 +++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-extended/groff/groff_1.20.1.bb

meta/recipes-extended/groff/groff_1.20.1.bb new file +36 -0

new file mode 100644
index 0000000..e0e198f
@@ -0,0 +1,36 @@
+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/"
+LICENSE = "GPLv2"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "48fa768dd6fdeb7968041dd5ae8e2b02"
+SRC_URI[sha256sum] = "b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805"
+
+DEPENDS = "groff-native"
+DEPENDS_virtclass-native = ""
+
+inherit autotools
+
+PARALLEL_MAKE = ""
+
+do_configure_prepend() {
+	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
+		sed -i \
+		    -e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \
+		    -e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \
+		    -e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
+		    -e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
+		    ${S}/contrib/*/Makefile.sub \
+		    ${S}/doc/Makefile.in \
+		    ${S}/doc/Makefile.sub
+	fi
+}
+
+BBCLASSEXTEND = "native"

Signature · 1 line

1.7.1

Saul Wold

2011-04-27 22:47 UTC #2 lore raw

Re: [PATCH 1/3] groff: update to 1.20.1

Quoted 6 lines · Kang Kai

From: Kang Kai<[email protected]>
Update groff to 1.20.1, add SUMMARY and LICENSE info
Quoted 1 line
From OE 70bf94cd8669f549ca90581e9592d409b6e24e2e
Fixes [Yocto 879]

Why did you not updated the existing recipe, via a git mv and then edit it. We do not keep older recipes around, so they should be cleaned up.

Also, why do we need a native for this recipe? For dealing with documentation native side?

Sau!

Quoted 48 lines

Signed-off-by Kang Kai<[email protected]>

---
  meta/recipes-extended/groff/groff_1.20.1.bb |   36 +++++++++++++++++++++++++++
  1 files changed, 36 insertions(+), 0 deletions(-)

create mode 100644 meta/recipes-extended/groff/groff_1.20.1.bb

meta/recipes-extended/groff/groff_1.20.1.bb new file +36 -0

new file mode 100644
index 0000000..e0e198f
@@ -0,0 +1,36 @@
+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/"
+LICENSE = "GPLv2"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "48fa768dd6fdeb7968041dd5ae8e2b02"
+SRC_URI[sha256sum] = "b645878135cb620c6c417c5601bfe96172245af12045540d7344938b4c2cd805"
+
+DEPENDS = "groff-native"
+DEPENDS_virtclass-native = ""
+
+inherit autotools
+
+PARALLEL_MAKE = ""
+
+do_configure_prepend() {
+	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
+		sed -i \
+		    -e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \
+		    -e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \
+		    -e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
+		    -e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
+		    ${S}/contrib/*/Makefile.sub \
+		    ${S}/doc/Makefile.in \
+		    ${S}/doc/Makefile.sub
+	fi
+}
+
+BBCLASSEXTEND = "native"

Kang Kai

author

2011-04-27 09:29 UTC #3 lore raw

PATCH 2/3 lsbsetup: add commands install_initd and remove_initd

In reply to Kang Kai

From: Kang Kai <[email protected]>

Add commands install_initd and remove_initd link to chkconfig, which can handler LSB format init.d scripts. Needed by LSB commands check. Bump PR to r2
Part fixes [Yocto 520]

Signed-off-by Kang Kai <[email protected]>

---
 meta/recipes-extended/lsb/lsbsetup_0.9.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

meta/recipes-extended/lsb/lsbsetup_0.9.bb +6 -1

index 5fd0584..73720ea 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "auto-setup environment for lsb test"
 SECTION = "console/utils"
 PRIORITY = "required"
 LICENSE = "GPLv2"
-PR = "r1"
+PR = "r2"
 
 LIC_FILES_CHKSUM = "file://LSB_Setup.sh;beginline=3;endline=16;md5=97451c7c0786ce5bbe9ac58042945583"

@@ -14,4 +14,9 @@ do_install() {
         # Only install file if it has a contents
         install -d ${D}/usr/bin
         install -m 0755 ${S}/LSB_Setup.sh ${D}/usr/bin
+        mkdir -p ${D}/usr/lib/lsb
+        ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
+        ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
 }
+
+FILES_${PN} += "${libdir}/lsb"

Signature · 1 line

1.7.1

Saul Wold

2011-04-27 17:04 UTC #4 lore raw

Re: [PATCH 2/3] lsbsetup: add commands install_initd and remove_initd

Quoted 26 lines · Kang Kai

From: Kang Kai<[email protected]>
Add commands install_initd and remove_initd link to chkconfig, which can handler LSB format init.d scripts. Needed by LSB commands check. Bump PR to r2
Part fixes [Yocto 520]
Signed-off-by Kang Kai<[email protected]>
---
  meta/recipes-extended/lsb/lsbsetup_0.9.bb |    7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-extended/lsb/lsbsetup_0.9.bb +1 -1
index 5fd0584..73720ea 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "auto-setup environment for lsb test"
  SECTION = "console/utils"
  PRIORITY = "required"
  LICENSE = "GPLv2"
-PR = "r1"
+PR = "r2"
 
  LIC_FILES_CHKSUM = "file://LSB_Setup.sh;beginline=3;endline=16;md5=97451c7c0786ce5bbe9ac58042945583"
 

meta/recipes-extended/lsb/lsbsetup_0.9.bb do_install() { · line 17

Quoted 4 lines

meta/recipes-extended/lsb/lsbsetup_0.9.bb +1 -0

@@ -14,4 +14,9 @@ do_install() {
          # Only install file if it has a contents
          install -d ${D}/usr/bin
          install -m 0755 ${S}/LSB_Setup.sh ${D}/usr/bin
+        mkdir -p ${D}/usr/lib/lsb

I think this should be an install -d not a mkdir

Quoted 5 lines

meta/recipes-extended/lsb/lsbsetup_0.9.bb +4 -0

+        ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
+        ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
  }
+
+FILES_${PN} += "${libdir}/lsb"

Kang Kai

author

2011-04-27 09:29 UTC #5 lore raw

PATCH 3/3 task-core-lsb: add xdg-utils into lsb image

In reply to Kang Kai

From: Kang Kai <[email protected]>

Add xdg-utils in task-core-lsb, for LSB command check. Part fixes [Yocto 520]

Signed-off-by Kang Kai <[email protected]>

---
 meta/recipes-extended/tasks/task-core-lsb.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

meta/recipes-extended/tasks/task-core-lsb.bb +1 -0

index ef8acb1..ed705f1 100644
@@ -130,6 +130,7 @@ RDEPENDS_task-core-lsb-command-add = "\
     mailx \
     msmtp \
     chkconfig \
+    xdg-utils \
 "
 #    cups

Signature · 1 line

1.7.1