Quellcode durchsuchen

meta: set proper S value

After removal of auto-creating S we must ensure that all recipes are
using a proper value for S.

Fix all recipes that only need to set S equals to WORKDIR.

[YOCTO #5627]

(From OE-Core rev: 9d220b1bfe4589736604dd5a7129e3699377d830)

Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Petter Mabäcker vor 10 Jahren
Ursprung
Commit
4eb3db9a2c
24 geänderte Dateien mit 48 neuen und 1 gelöschten Zeilen
  1. 2 0
      meta/recipes-bsp/alsa-state/alsa-state.bb
  2. 2 0
      meta/recipes-bsp/hostap/hostap-conf_1.0.bb
  3. 2 0
      meta/recipes-bsp/keymaps/keymaps_1.0.bb
  4. 2 0
      meta/recipes-connectivity/connman/connman-conf.bb
  5. 2 0
      meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
  6. 2 0
      meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
  7. 2 0
      meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
  8. 2 0
      meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
  9. 2 0
      meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
  10. 2 0
      meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb
  11. 2 0
      meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb
  12. 2 0
      meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb
  13. 2 0
      meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
  14. 2 0
      meta/recipes-core/initscripts/initscripts_1.0.bb
  15. 2 0
      meta/recipes-core/systemd/systemd-systemctl-native.bb
  16. 1 1
      meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
  17. 2 0
      meta/recipes-core/udev/udev-extraconf_1.1.bb
  18. 2 0
      meta/recipes-devtools/opkg/opkg-collateral.bb
  19. 2 0
      meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb
  20. 2 0
      meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb
  21. 2 0
      meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
  22. 3 0
      meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
  23. 2 0
      meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
  24. 2 0
      meta/recipes-support/ptest-runner/ptest-runner_1.0.bb

+ 2 - 0
meta/recipes-bsp/alsa-state/alsa-state.bb

@@ -18,6 +18,8 @@ SRC_URI = "\
   file://alsa-state-init \
 "
 
+S = "${WORKDIR}"
+
 # As the recipe doesn't inherit systemd.bbclass, we need to set this variable
 # manually to avoid unnecessary postinst/preinst generated.
 python __anonymous() {

+ 2 - 0
meta/recipes-bsp/hostap/hostap-conf_1.0.bb

@@ -10,6 +10,8 @@ SRC_URI = "file://hostap_cs.modalias \
 
 inherit allarch
 
+S = "${WORKDIR}"
+
 do_compile() {
 }
 

+ 2 - 0
meta/recipes-bsp/keymaps/keymaps_1.0.bb

@@ -26,6 +26,8 @@ SRC_URI = "file://keymap.sh \
 INITSCRIPT_NAME = "keymap.sh"
 INITSCRIPT_PARAMS = "start 01 S ."
 
+S = "${WORKDIR}"
+
 do_install () {
     # Only install the script if 'sysvinit' is in DISTRO_FEATURES
     # THe ulitity this script provides could be achieved by systemd-vconsole-setup.service

+ 2 - 0
meta/recipes-connectivity/connman/connman-conf.bb

@@ -9,6 +9,8 @@ SRC_URI_append_qemuall = "file://wired.config \
                          "
 PR = "r2"
 
+S = "${WORKDIR}"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FILES_${PN} = "${localstatedir}/* ${libdir}/*"

+ 2 - 0
meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb

@@ -12,6 +12,8 @@ SRC_URI = "file://host-peer \
 
 inherit allarch useradd
 
+S = "${WORKDIR}"
+
 do_install() {
 	install -d ${D}${sysconfdir}/ppp/peers
 	install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host

+ 2 - 0
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb

@@ -16,6 +16,8 @@ SRC_URI = "file://copyright \
            file://interfaces \
            file://nfsroot"
 
+S = "${WORKDIR}"
+
 do_install () {
 	install -d ${D}${sysconfdir}/init.d \
 			${D}${sysconfdir}/network/if-pre-up.d \

+ 2 - 0
meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb

@@ -5,6 +5,8 @@ SRC_URI = "file://init-boot.sh"
 
 PR = "r2"
 
+S = "${WORKDIR}"
+
 do_install() {
         install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init
 }

+ 2 - 0
meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb

@@ -14,6 +14,8 @@ SRC_URI = "file://init \
            file://e2fs \
            file://debug"
 
+S = "${WORKDIR}"
+
 do_install() {
     install -d ${D}/init.d
 

+ 2 - 0
meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb

@@ -7,6 +7,8 @@ SRC_URI = "file://init-live.sh"
 
 PR = "r12"
 
+S = "${WORKDIR}"
+
 do_install() {
         install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
 }

+ 2 - 0
meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb

@@ -5,6 +5,8 @@ SRC_URI = "file://init-install-efi-testfs.sh"
 
 RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools"
 
+S = "${WORKDIR}"
+
 do_install() {
         install -m 0755 ${WORKDIR}/init-install-efi-testfs.sh ${D}/install-efi.sh
 }

+ 2 - 0
meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb

@@ -7,6 +7,8 @@ PR = "r1"
 
 RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools"
 
+S = "${WORKDIR}"
+
 do_install() {
         install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/install-efi.sh
 }

+ 2 - 0
meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb

@@ -5,6 +5,8 @@ SRC_URI = "file://init-install-testfs.sh"
 
 RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs"
 
+S = "${WORKDIR}"
+
 do_install() {
         install -m 0755 ${WORKDIR}/init-install-testfs.sh ${D}/install.sh
 }

+ 2 - 0
meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb

@@ -5,6 +5,8 @@ SRC_URI = "file://init-install.sh"
 
 PR = "r9"
 
+S = "${WORKDIR}"
+
 RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs"
 
 do_install() {

+ 2 - 0
meta/recipes-core/initscripts/initscripts_1.0.bb

@@ -35,6 +35,8 @@ SRC_URI = "file://functions \
            file://logrotate-dmesg.conf \
 "
 
+S = "${WORKDIR}"
+
 SRC_URI_append_arm = " file://alignment.sh"
 
 KERNEL_VERSION = ""

+ 2 - 0
meta/recipes-core/systemd/systemd-systemctl-native.bb

@@ -9,6 +9,8 @@ inherit native
 
 SRC_URI = "file://systemctl"
 
+S = "${WORKDIR}"
+
 do_install() {
 	install -d ${D}${bindir}
 	install -m 0755 ${WORKDIR}/systemctl ${D}${bindir}

+ 1 - 1
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb

@@ -6,7 +6,7 @@ PR = "r10"
 
 SRC_URI = "file://inittab"
 
-S = "${WORKDIR}/sysvinit-${PV}"
+S = "${WORKDIR}"
 
 INHIBIT_DEFAULT_DEPS = "1"
 

+ 2 - 0
meta/recipes-core/udev/udev-extraconf_1.1.bb

@@ -13,6 +13,8 @@ SRC_URI = " \
        file://localextra.rules \
 "
 
+S = "${WORKDIR}"
+
 
 do_install() {
     install -d ${D}${sysconfdir}/udev/rules.d

+ 2 - 0
meta/recipes-devtools/opkg/opkg-collateral.bb

@@ -8,6 +8,8 @@ SRC_URI = "file://opkg.conf.comments \
 	   file://dest \
 	   file://src "
 
+S = "${WORKDIR}"
+
 OPKGLIBDIR = "${localstatedir}/lib"
 do_compile () {
 	cat ${WORKDIR}/opkg.conf.comments >${WORKDIR}/opkg.conf

+ 2 - 0
meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb

@@ -9,6 +9,8 @@ SRC_URI = "file://run-postinsts \
            file://run-postinsts.init \
            file://run-postinsts.service"
 
+S = "${WORKDIR}"
+
 inherit allarch systemd update-rc.d
 
 INITSCRIPT_NAME = "run-postinsts"

+ 2 - 0
meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb

@@ -9,6 +9,8 @@ PR = "r3"
 
 SRC_URI = "file://securetty"
 
+S = "${WORKDIR}"
+
 # Since SERIAL_CONSOLES is likely to be set from the machine configuration
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 

+ 2 - 0
meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb

@@ -7,6 +7,8 @@ PR = "r33"
 
 SRC_URI = "file://xorg.conf"
 
+S = "${WORKDIR}"
+
 CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"

+ 3 - 0
meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb

@@ -4,8 +4,11 @@ LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7bf87fc37976e93ec66ad84fac58c098"
 SRC_URI = "file://modutils.sh \
 	   file://PD.patch"
+
 PR = "r7"
 
+S = "${WORKDIR}"
+
 INITSCRIPT_NAME = "modutils.sh"
 INITSCRIPT_PARAMS = "start 05 S ."
 

+ 2 - 0
meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb

@@ -6,6 +6,8 @@ PR = "r3"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
+S = "${WORKDIR}"
+
 do_install() {
 	install -d ${D}${sysconfdir}/init.d/
 	install -m 0755 ${WORKDIR}/qtdemo-init ${D}${sysconfdir}/init.d/qtdemo

+ 2 - 0
meta/recipes-support/ptest-runner/ptest-runner_1.0.bb

@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
 
 INHIBIT_DEFAULT_DEPS = "1"
 
+S = "${WORKDIR}"
+
 do_install () {
     mkdir -p ${D}${bindir}
     install -m 0755 ${WORKDIR}/ptest-runner ${D}${bindir}