diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/lsb')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_5.0.bb (renamed from import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_4.1.bb) | 7 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch | 17 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch | 21 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb (renamed from import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb) | 8 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 4 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list | 2 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/session | 11 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb | 5 |
8 files changed, 32 insertions, 43 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_4.1.bb b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_5.0.bb index 07856108b..df4812e4b 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_4.1.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsb_5.0.bb @@ -2,7 +2,6 @@ SUMMARY = "LSB support for OpenEmbedded" SECTION = "console/utils" HOMEPAGE = "http://prdownloads.sourceforge.net/lsb" LICENSE = "GPLv2+" -PR = "r2" LSB_CORE = "lsb-core-${TARGET_ARCH}" LSB_CORE_x86 = "lsb-core-ia32" @@ -43,12 +42,12 @@ do_install() { mkdir -p ${D}${base_libdir} mkdir -p ${D}${sysconfdir}/lsb-release.d - printf "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release + printf "LSB_VERSION=\"core-5.0-noarch:" > ${D}${sysconfdir}/lsb-release if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ]; then - printf "core-4.1-ia32" >> ${D}${sysconfdir}/lsb-release + printf "core-5.0-ia32" >> ${D}${sysconfdir}/lsb-release else - printf "core-4.1-${TARGET_ARCH}" >> ${D}${sysconfdir}/lsb-release + printf "core-5.0-${TARGET_ARCH}" >> ${D}${sysconfdir}/lsb-release fi echo "\"" >> ${D}${sysconfdir}/lsb-release echo "DISTRIB_ID=${DISTRO}" >> ${D}${sysconfdir}/lsb-release diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch index 17c90029c..c0076453f 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch @@ -7,18 +7,15 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> rc.d/init.d/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions -index 6850046..11223f7 100644 ---- a/rc.d/init.d/functions -+++ b/rc.d/init.d/functions -@@ -597,6 +597,6 @@ if [ "$_use_systemctl" = "1" ]; then - fi +Index: initscripts-9.72/rc.d/init.d/functions +=================================================================== +--- initscripts-9.72.orig/rc.d/init.d/functions ++++ initscripts-9.72/rc.d/init.d/functions +@@ -686,6 +686,6 @@ if [ "$_use_systemctl" = "1" ]; then + fi fi -strstr "$(cat /proc/cmdline)" "rc.debug" && set -x +strstr "$(cat /proc/cmdline)" "rc.debug" && set -x || true return 0 - --- -2.1.0 - + diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch index 9c58d90c3..e912daa70 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts/functions.patch @@ -1,7 +1,7 @@ -From 57468c5f4e364bdad556604dca09046e1afca929 Mon Sep 17 00:00:00 2001 +From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001 From: Fan Xin <fan.xin@jp.fujitsu.com> Date: Mon, 5 Jun 2017 16:26:47 +0900 -Subject: [PATCH] Upstream-Status: Inappropriate [configuration] +Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration] Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> @@ -10,23 +10,24 @@ Rebase on 9.72 Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> Upstream-Status: Pending + --- - initscripts-9.72/rc.d/init.d/functions | 2 +- + rc.d/init.d/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/initscripts-9.72/rc.d/init.d/functions b/initscripts-9.72/rc.d/init.d/functions -index 0f627f1..a6aa092 100644 ---- a/initscripts-9.72/rc.d/init.d/functions -+++ b/initscripts-9.72/rc.d/init.d/functions +diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions +index 2e3da964..1a204dec 100644 +--- a/rc.d/init.d/functions ++++ b/rc.d/init.d/functions @@ -59,7 +59,7 @@ systemctl_redirect () { [ -z "${COLUMNS:-}" ] && COLUMNS=80 if [ -z "${CONSOLETYPE:-}" ]; then -- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then -+ if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then +- if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then ++ if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)" else CONSOLETYPE="serial" -- -1.9.1 +2.15.1 diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb index 2d74a6f9d..46edeed8a 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb @@ -10,11 +10,13 @@ RCONFLICTS_${PN} = "initscripts-functions" LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6" -S="${WORKDIR}/initscripts-${PV}" -SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.gz/sha512/b6ed38f9576e9227c2ecf047e2d60e1e872f40d51d13861b0c91dddb282f10f7e6b79706a4d1435d7a57a14a0b73a1b71541cfe44c00e8e03ef96b08de19ec32/initscripts-${PV}.tar.gz \ - file://functions.patch;striplevel=2 \ +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/fedora-sysv/initscripts \ + file://functions.patch \ file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \ " +SRCREV = "a51c1b4f7dcf55b568b2ee4c2b18078849943469" +UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)" SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a" SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db" diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh index 0eb2793b1..073e247a5 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh @@ -60,7 +60,7 @@ fi PACKAGES_DIR="/var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb" -BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/${LSB_RELEASE}/binary" +BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/released-all/binary" RUNTIME_BASE_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/released-all/binary/runtime" RUNTIME_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/${LSB_RELEASE}/binary/runtime" APP_PACKAGES_DIR="${PACKAGES_DIR}/app-battery/${LSB_RELEASE}/${LSB_ARCH}" @@ -98,7 +98,7 @@ then fi # Official download server list. You can replace them with your own server. -SERVER_IPADDR="140.211.169.23" +SERVER_IPADDR="140.211.169.28" SERVER_NAME="ftp.linuxfoundation.org" if ! `grep -F -q "${SERVER_NAME}" /etc/hosts`; then diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list index 959f93150..1a6c11699 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/packages_list @@ -1,7 +1,7 @@ LSB_RELEASE="released-5.0" LSB_ARCH="lsbarch" -BASE_PACKAGES_LIST="lsb-setup-4.1.0-1.noarch.rpm" +BASE_PACKAGES_LIST="lsb-setup-5.0.0-2.noarch.rpm" RUNTIME_BASE_PACKAGES_LIST="lsb-dist-checker-5.0.0.1-1.targetarch.rpm \ lsb-tet3-lite-3.7-27.lsb5.targetarch.rpm \ diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/session b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/session index 3abcca740..4d47e40f7 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/session +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest/session @@ -2,7 +2,7 @@ VERBOSE_LEVEL: 1 ARCHITECTURE: targetarch USE_INTERNET: 1 -STD_VERSION: LSB 4.1 +STD_VERSION: LSB 5.0 STD_PROFILE: no [cmdchk] RUN: 1 @@ -126,15 +126,6 @@ VERSION: local|* AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/python AUTOREPLY_RESULTS_DIR: /opt/lsb/test/python/results -[qt4-azov] -RUN: 1 -VERSION: local|* - -[qt4-azov|local|*] -AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/qt4-azov -AUTOREPLY_X11_FONT_PATH: [default] -AUTOREPLY_RESULTS_DIR: /opt/lsb/test/qt4-azov/results - [xml2-azov] RUN: 1 VERSION: local|* diff --git a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb index 36f52fd73..a90c023d5 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/lsb/lsbtest_1.0.bb @@ -10,14 +10,13 @@ SRC_URI = "file://LSB_Test.sh \ file://packages_list \ file://session \ " -RDEPENDS_${PN} = "rpm" +RDEPENDS_${PN} = "lsb rpm" S = "${WORKDIR}" do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/LSB_Test.sh ${D}${bindir} install -d ${D}/opt/lsb-test + install -m 0755 ${S}/LSB_Test.sh ${D}/opt/lsb-test/LSB_Test.sh install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list install -m 0644 ${S}/session ${D}/opt/lsb-test/session if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then |
