Patchwork [1/1] lsbsetup: remove it

login
register
mail settings
Submitter Kang Kai
Date Nov. 16, 2012, 6:41 a.m.
Message ID <4a33588b40ff957aaa91b1da9554d7b850f98cff.1353031471.git.kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/39139/
State New
Headers show

Comments

Kang Kai - Nov. 16, 2012, 6:41 a.m.
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 <kai.kang@windriver.com>
---
 .../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

Patch

diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
index 0f6398f..fd7bd1a 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
@@ -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"
diff --git a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh b/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
deleted file mode 100644
index aec1858..0000000
--- a/meta/recipes-extended/lsb/lsbsetup/LSB_Setup.sh
+++ /dev/null
@@ -1,230 +0,0 @@ 
-#!/bin/bash
-
-# Copyright (C) 2010-2011 Wind River Systems, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-##Prepare Steps
-# Confirm the installed LSB Packages
-ARCH=`uname -m`
-APP_FILE=`ls /lsb-Application/*.rpm`
-if [ ! -f /opt/lsb/test/manager/bin/dist-checker-start.pl ]
-then
-        if [ -d /lsb-dist-testkit ];then
-		if [ ${ARCH} == i686 ];then
-                	echo "i486-suse" >> /etc/rpm/platform
-                	echo "i486-noarch" >> /etc/rpm/platform
-                	echo "i486-pc" >> /etc/rpm/platform
-                	echo "noarch-suse" >> /etc/rpm/platform
-		else
-                	echo "${ARCH}-suse" >> /etc/rpm/platform
-                	echo "${ARCH}-noarch" >> /etc/rpm/platform
-                	echo "${ARCH}-pc" >> /etc/rpm/platform
-                	echo "noarch-suse" >> /etc/rpm/platform
-                fi      
-                cd /lsb-dist-testkit && sh install.sh && cd ../lsb-Application
-                for i in ${APP_FILE}
-                do
-                    echo "$i" |grep -q "apache"
-                    if [ $? -eq 0 ]
-                    then
-                        rpm -ivh $i --noscripts --nodeps --force
-                    else
-                        rpm -ivh $i --nodeps --force
-                    fi
-                done
-                mkdir -p /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
-                mkdir -p  /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/ 
-		cp expect-tests.tar  test1.pdf  test2.pdf /var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb/app-battery/tests/
-                cp raptor-tests.tar  tcl-tests.tar /var/opt/lsb//test/manager/packages/ftp.linuxfoundation.org/pub/lsb/snapshots/appbat/tests/
-		cd ..
-        else 
-                echo "Please install the realted LSB Packages"
-                exit 1
-        fi
-fi
-
-# Deleted existed user tester
-id tester
-if [ $? -eq  0 ]
-then 
-        echo "User tester was existed"
-        sleep 1
-        userdel -rf tester
-        if [ $? -eq 0 ] || [ $? -eq 6 ]
-        then
-                echo "Success to delete user tester"
-       else
-                echo "Fail to delete user tester"
-        fi
-else 
-        echo "There was not User tester"
-fi
-
-##Funs
-check ()
-{
-if [ $? -eq 0 ]
-then
-        echo "PASS"
-else 
-        echo "FAIL"
-        exit 1
-fi
-}
-
-###Start 
-# Add tester group
-echo ""
-echo "---------------------------------"
-echo "Step 1:Add Group tester"
-groupadd tester
-check
-
-
-# Add User tester 
-echo ""
-echo "---------------------------------"
-echo "Step 2:Add User tester"
-useradd -g tester tester
-check 
-
-echo "Check the tester user"
-id tester
-check 
-
-# Stop Boa server
-#echo ""
-#echo "---------------------------------"
-#echo "Step 3:Stop BOA server"
-#/etc/init.d/boa stop
-#check
-
-# Create Dirnames file for RPM
-echo ""
-echo "---------------------------------"
-echo "Step 4:Create the Dirnames on target"
-
-mkdir -pv /etc/rpm/sysinfo 
-
-cat > /etc/rpm/sysinfo/Dirnames << EOF
-/etc/opt/lsb
-/home/tet/LSB.tools
-/opt/lsb-tet3-lite/lib/ksh
-/opt/lsb-tet3-lite/lib/perl
-/opt/lsb-tet3-lite/lib/posix_sh
-/opt/lsb-tet3-lite/lib/tet3
-/opt/lsb-tet3-lite/lib/xpg3sh
-/opt/lsb/appbat/lib/python2.4/site-packages/qm
-/opt/lsb/appbat/lib/python2.4/site-packages/qm/external
-/opt/lsb/appbat/lib/python2.4/site-packages/qm/external/DocumentTemplate
-/opt/lsb/appbat/lib/python2.4/site-packages/qm/test
-/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/classes
-/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/web
-/opt/lsb/test/doc
-/opt/lsb/test/lib
-/opt/lsb/test/qm/diagnostics
-/opt/lsb/test/qm/doc
-/opt/lsb/test/qm/doc/test/html
-/opt/lsb/test/qm/doc/test/print
-/opt/lsb/test/qm/dtml
-/opt/lsb/test/qm/dtml/test
-/opt/lsb/test/qm/messages/test
-/opt/lsb/test/qm/tutorial/test/tdb
-/opt/lsb/test/qm/tutorial/test/tdb/QMTest
-/opt/lsb/test/qm/web
-/opt/lsb/test/qm/web/images
-/opt/lsb/test/qm/web/stylesheets
-/opt/lsb/test/qm/xml
-/opt/lsb/test/share
-/usr/share/doc/lsb-runtime-test
-/var/opt/lsb
-/opt/lsb/test/desktop
-/opt/lsb/test/desktop/fontconfig
-/opt/lsb/test/desktop/freetype
-/opt/lsb/test/desktop/gtkvts
-/opt/lsb/test/desktop/libpng
-/opt/lsb/test/desktop/qt3
-/opt/lsb/test/desktop/xft
-/opt/lsb/test/desktop/xml
-/opt/lsb/test/desktop/xrender
-
-
-EOF
-
-if [ -f /etc/rpm/sysinfo/Dirnames ]
-then
-        echo "Success to creat Dirnames file"
-else 
-        echo "Fail to creat Dirnames file"
-fi
-
-# ldconfig 
-echo ""
-echo "---------------------------------"
-echo "Step 5:"
-ldconfig -v
-check;
-
-
-# Insmod look.ko
-insmod /lib/modules/2.6.*/kernel/drivers/block/loop.ko
-if [ $? != 0 ];then
-	echo "Please insmod loop.ko  manully"
-fi
-# Start lsb 
-echo ""
-if [ -f /opt/lsb/test/manager/bin/dist-checker-start.pl ];then
-        /opt/lsb/test/manager/bin/dist-checker-start.pl
-fi
-
-# Get ip address for target platform
-addr=`ifconfig eth0 | grep "inet addr" | awk -F: '{print $2}'|sed s/[[:space:]][[:space:]]Bcast//g`
-echo -e "you should input ${addr}:8888 on your browser"
-
-# Workaround to add part of locales for LSB test
-localedef -i ja_JP -f EUC-JP ja_JP.eucjp
-localedef -i en_US -f ISO-8859-15  en_US.ISO-8859-15
-localedef -i en_US -f ISO-8859-1  en_US.ISO-8859-1
-localedef -i en_US -f ISO-8859-1 en_US
-localedef -i de_DE -f UTF-8  de_DE.UTF-8
-localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
-localedef -i en_US -f UTF-8 en_US.UTF-8
-localedef -i se_NO -f UTF-8 se_NO.UTF-8
-localedef -i de_DE -f ISO-8859-1 de_DE
-localedef -i de_DE -f ISO-8859-15 de_DE.ISO-8859-15
-localedef -i en_US -f ISO-8859-1 en_US.ISO8859-1
-localedef -i fr_FR -f ISO-8859-1 fr_FR
-localedef -i it_IT -f ISO-8859-1 it_IT
-localedef -i es_MX  -f ISO-8859-1 es_MX
-localedef -i en_HK -f ISO-8859-1 en_HK
-localedef -i en_PH -f ISO-8859-1 en_PH
-localedef -i ta_IN -f UTF-8 ta_IN
-
-# Resolve localhost 
-LOCALHOST=`hostname`
-if ! `grep -F -q "$LOCALHOST" /etc/hosts`; then
-    echo "127.0.0.1 $LOCALHOST" >> /etc/hosts
-fi
-
-# Start avahi-daemon                                      
-/etc/init.d/avahi-daemon start                           
-ln -s /etc/init.d/avahi-daemon /etc/rc5.d/S88avahi-daemon 
-
-# Done
-echo "Done!!"
-
-###End
-
-
diff --git a/meta/recipes-extended/lsb/lsbsetup_1.0.bb b/meta/recipes-extended/lsb/lsbsetup_1.0.bb
deleted file mode 100644
index 2792d51..0000000
--- a/meta/recipes-extended/lsb/lsbsetup_1.0.bb
+++ /dev/null
@@ -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}/* \
-               "
diff --git a/meta/recipes-extended/msmtp/msmtp_1.4.24.bb b/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
index 13de167..5a290a4 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
+++ b/meta/recipes-extended/msmtp/msmtp_1.4.24.bb
@@ -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"
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 32dc58e..51517dc 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -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 \