| Message ID | 20240531194533.23925-3-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | Updates to support UNPACKDIR | expand |
diff --git a/meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config.bb b/meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config.bb index c932e67f..d1c51012 100644 --- a/meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config.bb +++ b/meta-arago-demos/recipes-core/matrix/matrix-lighttpd-config.bb @@ -12,11 +12,12 @@ SRC_URI = "file://lighttpd.conf.matrix" # Grabbed COPYING file from lighttpd_1.4.30 SRC_URI += "file://COPYING" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { install -d ${D}${sysconfdir}/lighttpd - install -m 0644 ${WORKDIR}/lighttpd.conf.matrix ${D}${sysconfdir}/lighttpd/lighttpd.conf.matrix + install -m 0644 ${S}/lighttpd.conf.matrix ${D}${sysconfdir}/lighttpd/lighttpd.conf.matrix } FILES:${PN} = "${sysconfdir}/lighttpd/lighttpd.conf.matrix" diff --git a/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb b/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb index 0eaf9314..50cf218e 100644 --- a/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb +++ b/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb @@ -6,7 +6,8 @@ CLEANBROKEN = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" BOOSTRAP_IMAGE = "tisdk-bootstrap-base-image" diff --git a/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb b/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb index cb7fa93f..0e7b446d 100644 --- a/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb +++ b/meta-arago-distro/recipes-connectivity/bt-enable/bt-enable.bb @@ -9,7 +9,8 @@ SRC_URI = " \ PR = "r1" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" INITSCRIPT_NAME = "bt-enable.sh" INITSCRIPT_PARAMS = "defaults 99" diff --git a/meta-arago-distro/recipes-connectivity/initscript-telnetd/initscript-telnetd.bb b/meta-arago-distro/recipes-connectivity/initscript-telnetd/initscript-telnetd.bb index e492119b..c71a3fdb 100644 --- a/meta-arago-distro/recipes-connectivity/initscript-telnetd/initscript-telnetd.bb +++ b/meta-arago-distro/recipes-connectivity/initscript-telnetd/initscript-telnetd.bb @@ -5,7 +5,8 @@ PR ="r1" SRC_URI = "file://telnetd" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" INITSCRIPT_NAME = "telnetd" INITSCRIPT_PARAMS = "defaults 10" diff --git a/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb b/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb index 3158da5a..4d84bed4 100644 --- a/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb +++ b/meta-arago-distro/recipes-connectivity/systemd-telnetd/systemd-telnetd.bb @@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://telnetd.service;beginline=1;endline=17;md5=d134d0d385 SRC_URI = "file://telnetd.service" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" inherit systemd @@ -16,5 +17,5 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" do_install:append () { # install systemd unit files install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/telnetd.service ${D}${systemd_system_unitdir} + install -m 0644 ${S}/telnetd.service ${D}${systemd_system_unitdir} } diff --git a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb index 6cb428a5..aeb45167 100644 --- a/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb +++ b/meta-arago-distro/recipes-core/arago-gpl-notice/arago-gpl-notice.bb @@ -4,7 +4,8 @@ LIC_FILES_CHKSUM = "file://print-gplv3-packages.sh;beginline=2;endline=18;md5=d1 PR = "r3" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" INITSCRIPT_NAME = "gplv3-notice" INITSCRIPT_PARAMS = "defaults 99" @@ -24,7 +25,7 @@ do_install(){ install -d ${D}${bindir} install -d ${D}${systemd_system_unitdir} install -m 0755 ${S}/print-gplv3-packages.sh ${D}${bindir}/gplv3-notice - install -m 0644 ${WORKDIR}/gplv3-notice.service ${D}${systemd_system_unitdir} + install -m 0644 ${S}/gplv3-notice.service ${D}${systemd_system_unitdir} fi } diff --git a/meta-arago-distro/recipes-core/busybox/softap-udhcpd-config_1.0.bb b/meta-arago-distro/recipes-core/busybox/softap-udhcpd-config_1.0.bb index 0c896fed..a5a3e1d0 100644 --- a/meta-arago-distro/recipes-core/busybox/softap-udhcpd-config_1.0.bb +++ b/meta-arago-distro/recipes-core/busybox/softap-udhcpd-config_1.0.bb @@ -8,7 +8,8 @@ PR = "r1" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" # Default configuration file is from the base udhcp package SRC_URI = "file://udhcpd.conf \ diff --git a/meta-arago-distro/recipes-tisdk/tisdk-readme/tisdk-readme.bb b/meta-arago-distro/recipes-tisdk/tisdk-readme/tisdk-readme.bb index 59df0c97..157e7354 100644 --- a/meta-arago-distro/recipes-tisdk/tisdk-readme/tisdk-readme.bb +++ b/meta-arago-distro/recipes-tisdk/tisdk-readme/tisdk-readme.bb @@ -11,7 +11,8 @@ PV = "1.0" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install () { install -d ${D}/board-support/prebuilt-images diff --git a/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb b/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb index 76c83e7d..7bd601a0 100644 --- a/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb +++ b/meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb @@ -11,7 +11,8 @@ PV = "1.0" PACKAGE_ARCH = "${MACHINE_ARCH}" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install () { install -d ${D}/board-support/prebuilt-images diff --git a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb index db48d746..1694792c 100644 --- a/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb +++ b/meta-arago-extras/recipes-graphics/tslib/ts-calibrate-init_1.0.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://init;beginline=2;endline=11;md5=4b2e3b15f01cf63d2cb79 PR = "r4" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" INITSCRIPT_NAME = "ts-calibrate" @@ -26,5 +27,5 @@ do_install(){ # Install the init script # TODO: replace init script with systemd files install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ts-calibrate + install -m 0755 ${S}/init ${D}${sysconfdir}/init.d/ts-calibrate } diff --git a/meta-arago-extras/recipes-sysrepo/nw-configurator/nw-configurator.bb b/meta-arago-extras/recipes-sysrepo/nw-configurator/nw-configurator.bb index c5d9a86b..b383571d 100644 --- a/meta-arago-extras/recipes-sysrepo/nw-configurator/nw-configurator.bb +++ b/meta-arago-extras/recipes-sysrepo/nw-configurator/nw-configurator.bb @@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://nw-configurator.c;beginline=1;endline=33;md5=3538caaf SRC_URI = "file://nw-configurator.c" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" FILES_${PN}-dev = "${includedir}" @@ -14,7 +15,7 @@ DEPENDS = "sysrepo" inherit autotools pkgconfig do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} -I=${STAGING_INCDIR} ${WORKDIR}/nw-configurator.c -o nw-configurator -lsysrepo + ${CC} ${CFLAGS} ${LDFLAGS} -I=${STAGING_INCDIR} ${S}/nw-configurator.c -o nw-configurator -lsysrepo } BBCLASSEXTEND = "native nativesdk"
Follow along with the corresponding patch in upstream. [1] [1] https://git.openembedded.org/openembedded-core/commit/?h=master-next&id=d9328e3b0b062f0621de3d114584b44f384a1c02 Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- .../recipes-core/matrix/matrix-lighttpd-config.bb | 5 +++-- .../recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb | 3 ++- .../recipes-connectivity/bt-enable/bt-enable.bb | 3 ++- .../initscript-telnetd/initscript-telnetd.bb | 3 ++- .../recipes-connectivity/systemd-telnetd/systemd-telnetd.bb | 5 +++-- .../recipes-core/arago-gpl-notice/arago-gpl-notice.bb | 5 +++-- .../recipes-core/busybox/softap-udhcpd-config_1.0.bb | 3 ++- meta-arago-distro/recipes-tisdk/tisdk-readme/tisdk-readme.bb | 3 ++- meta-arago-distro/recipes-tisdk/tisdk-uenv/tisdk-uenv.bb | 3 ++- .../recipes-graphics/tslib/ts-calibrate-init_1.0.bb | 5 +++-- .../recipes-sysrepo/nw-configurator/nw-configurator.bb | 5 +++-- 11 files changed, 27 insertions(+), 16 deletions(-)