diff options
| -rw-r--r-- | recipes-bsp/bootfiles/bcm2835-bootfiles.bb | 6 | ||||
| -rw-r--r-- | recipes-bsp/bootfiles/rpi-config_git.bb | 7 | ||||
| -rw-r--r-- | recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb | 4 | ||||
| -rw-r--r-- | recipes-core/udev/udev-rules-rpi.bb | 2 | ||||
| -rw-r--r-- | recipes-core/udev/udev-rules-udisks-rpi_1.0.bb | 2 | ||||
| -rw-r--r-- | recipes-graphics/vc-graphics/vc-graphics.inc | 2 | ||||
| -rw-r--r-- | recipes-kernel/linux-firmware/linux-firmware-raspbian.bb | 2 |
7 files changed, 20 insertions, 5 deletions
diff --git a/recipes-bsp/bootfiles/bcm2835-bootfiles.bb b/recipes-bsp/bootfiles/bcm2835-bootfiles.bb index a115037..f9af17b 100644 --- a/recipes-bsp/bootfiles/bcm2835-bootfiles.bb +++ b/recipes-bsp/bootfiles/bcm2835-bootfiles.bb @@ -3,10 +3,12 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://LICENCE.broadcom;md5=4a4d169737c0786fb9482bb6d30401d1" -inherit deploy +inherit deploy nopackages include recipes-bsp/common/firmware.inc +INHIBIT_DEFAULT_DEPS = "1" + RDEPENDS_${PN} = "rpi-config" COMPATIBLE_MACHINE = "^rpi$" @@ -32,7 +34,7 @@ do_deploy() { touch ${DEPLOYDIR}/${PN}/${PN}-${PV}.stamp } -addtask deploy before do_package after do_install +addtask deploy before do_build after do_install do_deploy[dirs] += "${DEPLOYDIR}/${PN}" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb index c04090f..e21872e 100644 --- a/recipes-bsp/bootfiles/rpi-config_git.bb +++ b/recipes-bsp/bootfiles/rpi-config_git.bb @@ -15,6 +15,8 @@ S = "${WORKDIR}/git" PR = "r5" +INHIBIT_DEFAULT_DEPS = "1" + PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" PITFT22="${@bb.utils.contains("MACHINE_FEATURES", "pitft22", "1", "0", d)}" PITFT28r="${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "1", "0", d)}" @@ -23,7 +25,8 @@ PITFT35r="${@bb.utils.contains("MACHINE_FEATURES", "pitft35r", "1", "0", d)}" VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" VC4DTBO_raspberrypi3-64 ?= "vc4-fkms-v3d" VC4DTBO ?= "vc4-kms-v3d" -inherit deploy + +inherit deploy nopackages do_deploy() { install -d ${DEPLOYDIR}/bcm2835-bootfiles @@ -185,7 +188,7 @@ do_deploy_append_raspberrypi3-64() { echo "device_tree=bcm2710-rpi-3-b.dtb" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt } -addtask deploy before do_package after do_install +addtask deploy before do_build after do_install do_deploy[dirs] += "${DEPLOYDIR}/bcm2835-bootfiles" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb b/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb index 3457300..0106ac3 100644 --- a/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb +++ b/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb @@ -5,6 +5,8 @@ COMPATIBLE_MACHINE = "^rpi$" DEPENDS = "u-boot-mkimage-native" +INHIBIT_DEFAULT_DEPS = "1" + SRC_URI = "file://boot.cmd.in" do_compile() { @@ -14,7 +16,7 @@ do_compile() { mkimage -A arm -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr } -inherit deploy +inherit deploy nopackages do_deploy() { install -d ${DEPLOYDIR} diff --git a/recipes-core/udev/udev-rules-rpi.bb b/recipes-core/udev/udev-rules-rpi.bb index 20443d3..b249d97 100644 --- a/recipes-core/udev/udev-rules-rpi.bb +++ b/recipes-core/udev/udev-rules-rpi.bb @@ -6,6 +6,8 @@ SRC_URI = " file://99-com.rules" S = "${WORKDIR}" +INHIBIT_DEFAULT_DEPS = "1" + do_install () { install -d ${D}${sysconfdir}/udev/rules.d install -m 0644 ${WORKDIR}/99-com.rules ${D}${sysconfdir}/udev/rules.d/ diff --git a/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb b/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb index a238f52..ae35521 100644 --- a/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb +++ b/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb @@ -3,6 +3,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "file://80-udisks-rpi.rules" +INHIBIT_DEFAULT_DEPS = "1" + do_install () { install -d ${D}${base_libdir}/udev/rules.d install -m 644 ${WORKDIR}/80-udisks-rpi.rules ${D}${base_libdir}/udev/rules.d diff --git a/recipes-graphics/vc-graphics/vc-graphics.inc b/recipes-graphics/vc-graphics/vc-graphics.inc index 668c5ce..cd0d57b 100644 --- a/recipes-graphics/vc-graphics/vc-graphics.inc +++ b/recipes-graphics/vc-graphics/vc-graphics.inc @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=86e53f5f5909ee66900418028de11780" PROVIDES = "virtual/libgles2 virtual/egl" COMPATIBLE_MACHINE = "^rpi$" +INHIBIT_DEFAULT_DEPS = "1" + include recipes-bsp/common/firmware.inc SRC_URI += " \ diff --git a/recipes-kernel/linux-firmware/linux-firmware-raspbian.bb b/recipes-kernel/linux-firmware/linux-firmware-raspbian.bb index ee89301..d11a53b 100644 --- a/recipes-kernel/linux-firmware/linux-firmware-raspbian.bb +++ b/recipes-kernel/linux-firmware/linux-firmware-raspbian.bb @@ -5,6 +5,8 @@ LICENSE = "Firmware-broadcom_bcm43xx" LIC_FILES_CHKSUM = "file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc" +INHIBIT_DEFAULT_DEPS = "1" + # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source NO_GENERIC_LICENSE[Firmware-broadcom_bcm43xx] = "LICENCE.broadcom_bcm43xx" |