Skip to contentSkip to conversation

Remove package lsbsetup

PATCH In review Kang Kai 2 participants 3 messages Nov 16, 2012

lore
Share & tools
lore

Kang Kai

author
#0 lore raw

cover Remove package lsbsetup

The following changes since commit 9e0d3c0faa9cc80ce8f2ce0eb31dcd20ef875955:

sstate: Bump version number to deal with layout fixes (2012-11-14 23:37:45 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/lsb
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/lsb

Kang Kai (1):
lsbsetup: remove it

 .../recipes-extended/chkconfig/chkconfig_1.3.58.bb |   10 +-
 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh    |  230 --------------------
 meta/recipes-extended/lsb/lsbsetup_1.0.bb          |   26 ---
 meta/recipes-extended/msmtp/msmtp_1.4.24.bb        |    9 +-
 .../packagegroups/packagegroup-core-lsb.bb         |    3 +-
 5 files changed, 18 insertions(+), 260 deletions(-)
 delete mode 100644 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
 delete mode 100644 meta/recipes-extended/lsb/lsbsetup_1.0.bb
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/1 lsbsetup: remove it

lsbsetup provides script LSB_Setup.sh to setup LSB test on image. But script LSB_Test.sh provided by lsbtest replace its function now. So drop lsbsetup and remove it from packagegroup-core-lsb.

Even without linking /etc/localtime to HongKong zoneinfo file, the test case for wcsftime in lsb test PASS now(Yocto 1079), so remove this link.

Other links created by lsbsetup are moved to packages msmtp and chkconfig that they provides commands "sendmail" and "chkconfig".

[Yocto 3278]

Signed-off-by Kang Kai <[email protected]>
---
 .../recipes-extended/chkconfig/chkconfig_1.3.58.bb |   10 +-
 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh    |  230 --------------------
 meta/recipes-extended/lsb/lsbsetup_1.0.bb          |   26 ---
 meta/recipes-extended/msmtp/msmtp_1.4.24.bb        |    9 +-
 .../packagegroups/packagegroup-core-lsb.bb         |    3 +-
 5 files changed, 18 insertions(+), 260 deletions(-)
 delete mode 100644 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
 delete mode 100644 meta/recipes-extended/lsb/lsbsetup_1.0.bb
meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb +9 -1
index 0f6398f..fd7bd1a 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
 
 DEPENDS = "libnewt popt"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2"
 

@@ -30,3 +30,11 @@ do_install_append() {
     mkdir -p ${D}${sysconfdir}/chkconfig.d
     rm -f ${D}${sbindir}/update-alternatives
 }
+
+do_install_append_linuxstdbase() {
+	install -d ${D}${libdir}/lsb/
+	ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
+	ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
+}
+
+FILES_${PN}_append_linuxstdbase += "${libdir}/lsb"
meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh deleted +0 -230

230 lines not on this page · raw message

meta/recipes-extended/lsb/lsbsetup_1.0.bb deleted +0 -26
deleted file mode 100644
index 2792d51..0000000
@@ -1,26 +0,0 @@
-DESCRIPTION = "auto-setup environment for lsb test"
-SECTION = "console/utils"
-LICENSE = "GPLv2"
-PR = "r4"
-
-LIC_FILES_CHKSUM = "file://LSB_Setup.sh;beginline=3;endline=16;md5=97451c7c0786ce5bbe9ac58042945583"
-
-SRC_URI = "file://LSB_Setup.sh"
-
-S = "${WORKDIR}"
-
-do_install() {
-    # Only install file if it has a contents
-    install -d ${D}${bindir}
-    install -d ${D}/${sysconfdir}
-    install -m 0755 ${S}/LSB_Setup.sh ${D}${bindir}
-    install -d  ${D}/${libdir}/lsb
-    ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/install_initd
-    ln -sf ${base_sbindir}/chkconfig ${D}/${libdir}/lsb/remove_initd
-    ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
-    ln -sf ${datadir}/zoneinfo/Asia/Hong_Kong ${D}${sysconfdir}/localtime
-}
-
-FILES_${PN} += "${libdir}/lsb \
-               ${libdir}/* \
-               "
meta/recipes-extended/msmtp/msmtp_1.4.24.bb +8 -1
index 13de167..5a290a4 100644
@@ -5,7 +5,7 @@ SECTION = "console/network"
 
 LICENSE = "GPLv3"
 DEPENDS = "zlib gnutls"
-PR = "r4"
+PR = "r5"
 
 
 #COPYING or Licence

@@ -25,3 +25,10 @@ ALTERNATIVE_${PN} = "sendmail"
 ALTERNATIVE_TARGET[sendmail] = "${bindir}/msmtp"
 ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail"
 ALTERNATIVE_PRIORITY = "100"
+
+do_install_append_linuxstdbase() {
+	install -d ${D}${libdir}/
+	ln -sf ${sbindir}/sendmail ${D}/${libdir}/sendmail
+}
+
+FILES_${PN}_append_linuxstdbase += "${libdir}/sendmail"
meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +1 -2
index 32dc58e..51517dc 100644
@@ -4,7 +4,7 @@
 
 SUMMARY = "Linux Standard Base (LSB)"
 DESCRIPTION = "Packages required to satisfy the Linux Standard Base (LSB) specification"
-PR = "r9"
+PR = "r10"
 LICENSE = "MIT"
 
 inherit packagegroup

@@ -101,7 +101,6 @@ RDEPENDS_packagegroup-core-lsb-misc = "\
     gettext-runtime \
     groff \
     lsbinitscripts \
-    lsbsetup \
     lsbtest \
     lsof \
     strace \
Signature · 1 line
1.7.5.4
#2 lore raw
In reply to Kang Kai
Quoted 11 lines · Kang Kai

The following changes since commit 9e0d3c0faa9cc80ce8f2ce0eb31dcd20ef875955:

sstate: Bump version number to deal with layout fixes (2012-11-14 23:37:45 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/lsb
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/lsb

Kang Kai (1):
lsbsetup: remove it

This contains more than just removing lsbsetup, this should be broken up and documented properly.

Sau!

Quoted 9 lines
  .../recipes-extended/chkconfig/chkconfig_1.3.58.bb |   10 +-
  meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh    |  230 --------------------
  meta/recipes-extended/lsb/lsbsetup_1.0.bb          |   26 ---
  meta/recipes-extended/msmtp/msmtp_1.4.24.bb        |    9 +-
  .../packagegroups/packagegroup-core-lsb.bb         |    3 +-
  5 files changed, 18 insertions(+), 260 deletions(-)

delete mode 100644 meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh delete mode 100644 meta/recipes-extended/lsb/lsbsetup_1.0.bb