Skip to contentSkip to conversation

Fixes for LSB command check

PATCH New Kang Kai 1 participant 4 messages Apr 28, 2011

lore
Share & tools
lore

Kang Kai

author
#0 lore raw

cover Fixes for LSB command check

From: Kang Kai <[email protected]>

Hi Saul,

This time update groff and removing old version bb file and patches, and groff-native is needed for compiling packages like libuser. Update lsbsetup_0.9.bb by using install to create directory. 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

 .../groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch |   35 ---------------
 .../groff/groff-1.18.1.4/man-local.patch           |   32 --------------
 .../groff/groff-1.18.1.4/mdoc-local.patch          |   31 -------------
 meta/recipes-extended/groff/groff_1.18.1.4.bb      |   46 --------------------
 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 +
 7 files changed, 43 insertions(+), 145 deletions(-)
 delete mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
 delete mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
 delete mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
 delete mode 100644 meta/recipes-extended/groff/groff_1.18.1.4.bb
 create mode 100644 meta/recipes-extended/groff/groff_1.20.1.bb
author
#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]

---
 .../groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch |   35 ---------------
 .../groff/groff-1.18.1.4/man-local.patch           |   32 --------------
 .../groff/groff-1.18.1.4/mdoc-local.patch          |   31 -------------
 meta/recipes-extended/groff/groff_1.18.1.4.bb      |   46 --------------------
 meta/recipes-extended/groff/groff_1.20.1.bb        |   36 +++++++++++++++
 5 files changed, 36 insertions(+), 144 deletions(-)
 delete mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch
 delete mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch
 delete mode 100644 meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch
 delete mode 100644 meta/recipes-extended/groff/groff_1.18.1.4.bb
 create mode 100644 meta/recipes-extended/groff/groff_1.20.1.bb
meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch deleted +0 -35
deleted file mode 100644
index 90ad8e3..0000000
@@ -1,35 +0,0 @@
----
- groff-1.18.1.4/Makefile.in |    7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -460,27 +460,22 @@ OTHERDIRS=\
-   src/roff/grog \
-   src/roff/nroff \
-   contrib/mm \
-   contrib/pic2graph \
-   contrib/eqn2graph \
--  contrib/groffer \
--  contrib/mom \
--  doc
-+  contrib/groffer
- ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
-   $(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
- EXTRADIRS=\
-   font/devps/generate \
-   font/devdvi/generate \
-   font/devlj4/generate \
--  src/xditview \
-   doc
- NOMAKEDIRS=\
-   arch/djgpp \
-   contrib/mm/examples \
-   contrib/mm/mm \
--  contrib/mom/examples \
--  contrib/mom/momdoc \
-   src/libs/snprintf
- DISTDIRS=\
-   $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(OTHERDEVDIRS) \
-   $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS)
- TARGETS=all install install_bin install_data clean distclean mostlyclean \
meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch deleted +0 -32
deleted file mode 100644
index 34b4248..0000000
@@ -1,32 +0,0 @@
-Index: groff-1.18.1.4/tmac/man.local
-===================================================================
---- groff-1.18.1.4.orig/tmac/man.local	2000-10-26 22:15:17.000000000 +0800
-+++ groff-1.18.1.4/tmac/man.local	2010-08-24 14:17:52.070006664 +0800
-@@ -1,2 +1,27 @@
- .\" This file is loaded after an-old.tmac.
- .\" Put any local modifications to an-old.tmac here.
-+.
-+.if n \{\
-+.  \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other
-+.  \" than utf8.
-+.  if !'\*[.T]'utf8' \
-+.    tr \[oq]'
-+.
-+.  \" Debian: Disable the use of SGR (ANSI colour) escape sequences by
-+.  \" grotty.
-+.  if '\V[GROFF_SGR]'' \
-+.    output x X tty: sgr 0
-+.
-+.  \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make
-+.  \" searching in man pages easier.
-+.  if '\*[.T]'utf8' \
-+.    char \- \N'45'
-+.
-+.  \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such
-+.  \" as those in command-line options. This is a bug in those pages, but
-+.  \" too many fonts are missing the Unicode HYPHEN character, so we render
-+.  \" this as the ASCII-compatible HYPHEN-MINUS instead.
-+.  if '\*[.T]'utf8' \
-+.    char - \N'45'
-+.\}
-+
meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch deleted +0 -31
deleted file mode 100644
index 140a544..0000000
@@ -1,31 +0,0 @@
-Index: groff-1.18.1.4/tmac/mdoc.local
-===================================================================
---- groff-1.18.1.4.orig/tmac/mdoc.local	2001-03-23 08:17:51.000000000 +0800
-+++ groff-1.18.1.4/tmac/mdoc.local	2010-08-24 14:20:22.014006846 +0800
-@@ -1,2 +1,26 @@
- .\" This file is loaded after doc.tmac.
- .\" Put any local modifications to doc.tmac here.
-+.
-+.if n \{\
-+.  \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other
-+.  \" than utf8.
-+.  if !'\*[.T]'utf8' \
-+.    tr \[oq]'
-+.
-+.  \" Debian: Disable the use of SGR (ANSI colour) escape sequences by
-+.  \" grotty.
-+.  if '\V[GROFF_SGR]'' \
-+.    output x X tty: sgr 0
-+.
-+.  \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make
-+.  \" searching in man pages easier.
-+.  if '\*[.T]'utf8' \
-+.    char \- \N'45'
-+.
-+.  \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such
-+.  \" as those in command-line options. This is a bug in those pages, but
-+.  \" too many fonts are missing the Unicode HYPHEN character, so we render
-+.  \" this as the ASCII-compatible HYPHEN-MINUS instead.
-+.  if '\*[.T]'utf8' \
-+.    char - \N'45'
-+.\}
meta/recipes-extended/groff/groff_1.18.1.4.bb deleted +0 -46

46 lines not on this page · raw message

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
author
#2 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]

---
 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..8f7da53 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
+        install -d  ${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
author
#3 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]

---
 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