diff options
| author | Kang Kai <kai.kang@windriver.com> | 2012-09-05 17:31:04 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-10 12:05:34 +0100 |
| commit | 973e615ab4ee325ab568f84e001a5724f4b0dd01 (patch) | |
| tree | 864d5d8e042a4d0df5cd88f32ba712683a9363e9 /meta/recipes-extended/lsb | |
| parent | e14a9921928c774d1817704a0a606d3ac7e4f989 (diff) | |
| download | openembedded-core-973e615ab4ee325ab568f84e001a5724f4b0dd01.tar.gz openembedded-core-973e615ab4ee325ab568f84e001a5724f4b0dd01.tar.bz2 openembedded-core-973e615ab4ee325ab568f84e001a5724f4b0dd01.zip | |
lsb: update version
Update package lsb version to be same with current lsb test suit
version. Because when install the suit, it warns that need lsb
version >= 3.0 at least.
Drop the duplicated creating files under /etc/lsb-release.d.
Provides directories /etc/opt and /var/opt that they are required by
package lsb-dist-checker in lsb test suit.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/lsb')
| -rw-r--r-- | meta/recipes-extended/lsb/lsb_4.1.bb (renamed from meta/recipes-extended/lsb/lsb_1.4.bb) | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_4.1.bb index 513998cab8..a3242db708 100644 --- a/meta/recipes-extended/lsb/lsb_1.4.bb +++ b/meta/recipes-extended/lsb/lsb_4.1.bb @@ -2,14 +2,14 @@ DESCRIPTION = "LSB support for OpenEmbedded" SECTION = "console/utils" HOMEPAGE = "http://prdownloads.sourceforge.net/lsb" LICENSE = "GPLv2+" -PR = "r4" +PR = "r0" # lsb_release needs getopt RDEPENDS_${PN} += "util-linux" LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/${PV}/lsb-release-${PV}.tar.gz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/1.4/lsb-release-1.4.tar.gz \ file://init-functions \ file://lsb_killproc \ file://lsb_log_message \ @@ -19,15 +19,20 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/${PV}/lsb-release-${PV} SRC_URI[md5sum] = "30537ef5a01e0ca94b7b8eb6a36bb1e4" SRC_URI[sha256sum] = "99321288f8d62e7a1d485b7c6bdccf06766fb8ca603c6195806e4457fdf17172" -S = "${WORKDIR}/lsb-release-${PV}" +S = "${WORKDIR}/lsb-release-1.4" do_install(){ - oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D} + oe_runmake install prefix=${D} mandir=${D}/${datadir}/man/ DESTDIR=${D} + + # this 2 dirs are needed by package lsb-dist-checker + mkdir -p ${D}${sysconfdir}/opt + mkdir -p ${D}${localstatedir}/opt + mkdir -p ${D}${base_bindir} mkdir -p ${D}/${baselib} mkdir -p ${D}${sysconfdir}/lsb-release.d echo -n "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release - + if [ "${TARGET_ARCH}" = "i586" ];then echo -n "core-4.1-ia32" >> ${D}${sysconfdir}/lsb-release else @@ -37,29 +42,24 @@ do_install(){ echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}${sysconfdir}/lsb-release echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release - + if [ "${TARGET_ARCH}" = "i586" ];then mkdir -p ${D}${sysconfdir}/lsb-release.d - touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-noarch touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-noarch - touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-ia32 touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-ia32 touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ia32 elif [ "${TARGET_ARCH}" = "x86_64" ];then - touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-noarch - touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-amd64 + touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-amd64 touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-amd64 fi if [ "${TARGET_ARCH}" = "powerpc" ];then - touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-noarch - touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-ppc32 + touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-ppc32 touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ppc32 elif [ "${TARGET_ARCH}" = "powerpc64" ];then - touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-noarch - touch ${D}${sysconfdir}/lsb-release.d/graphics-4.1-ppc64 + touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-ppc64 touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-ppc64 fi @@ -87,9 +87,9 @@ do_install_append(){ ln -sf ld-linux.so.2 ld-lsb.so.2 ln -sf ld-linux.so.2 ld-lsb.so.3 fi - + if [ "${TARGET_ARCH}" = "powerpc64" ];then - cd ${D} + cd ${D} if [ "${baselib}" != "lib64" ]; then ln -sf ${baselib} lib64 fi @@ -101,7 +101,7 @@ do_install_append(){ cd ${D}/${baselib} ln -sf ld.so.1 ld-lsb-ppc32.so.2 ln -sf ld.so.1 ld-lsb-ppc32.so.3 - fi + fi } FILES_${PN} += "/lib64 \ ${base_libdir}/lsb/* \ |