diff options
| -rw-r--r-- | meta/classes-recipe/systemd.bbclass | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg/wrapper | 8 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg_0.6.3.bb | 5 |
3 files changed, 1 insertions, 13 deletions
diff --git a/meta/classes-recipe/systemd.bbclass b/meta/classes-recipe/systemd.bbclass index 3bb28442bd1..48b364c1d4d 100644 --- a/meta/classes-recipe/systemd.bbclass +++ b/meta/classes-recipe/systemd.bbclass @@ -49,7 +49,6 @@ if systemctl >/dev/null 2>/dev/null; then if [ "${SYSTEMD_AUTO_ENABLE}" = "enable" ]; then systemctl --no-block restart ${SYSTEMD_SERVICE_ESCAPED} fi - sleep 5 fi fi } diff --git a/meta/recipes-devtools/opkg/opkg/wrapper b/meta/recipes-devtools/opkg/opkg/wrapper deleted file mode 100644 index 0e8902771f0..00000000000 --- a/meta/recipes-devtools/opkg/opkg/wrapper +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -realpath=`readlink -fn $0` -realdir=`dirname $realpath` -echo "New call $$" >> /tmp/opkglog -date >> /tmp/opkglog -ps >> /tmp/opkglog -echo "$@" >> /tmp/opkglog -exec -a $realdir/opkg $realdir/opkg.real "$@" diff --git a/meta/recipes-devtools/opkg/opkg_0.6.3.bb b/meta/recipes-devtools/opkg/opkg_0.6.3.bb index 22620f5f64c..ef7c4f3a728 100644 --- a/meta/recipes-devtools/opkg/opkg_0.6.3.bb +++ b/meta/recipes-devtools/opkg/opkg_0.6.3.bb @@ -17,7 +17,6 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ file://0001-libopkg-Use-libgen.h-to-provide-basename-API.patch \ file://run-ptest \ - file://wrapper \ " SRC_URI[sha256sum] = "f3938e359646b406c40d5d442a1467c7e72357f91ab822e442697529641e06de" @@ -55,8 +54,6 @@ do_install:append () { # We need to create the lock directory install -d ${D}${OPKGLIBDIR}/opkg - mv ${D}${bindir}/opkg ${D}${bindir}/opkg.real - install -m 0755 ${WORKDIR}/wrapper ${D}${bindir}/opkg } do_install_ptest () { @@ -73,7 +70,7 @@ def qa_check_solver_deprecation (pn, d, messages): oe.qa.handle_error("internal-solver-deprecation", "The opkg internal solver will be deprecated in future opkg releases. Consider enabling \"libsolv\" in PACKAGECONFIG.", d) -RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive bash" +RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive" RDEPENDS:${PN}:class-native = "" RDEPENDS:${PN}:class-nativesdk = "" RDEPENDS:${PN}-ptest += "make binutils python3-core python3-compression bash python3-crypt python3-io" |