Squashed 'import-layers/meta-raspberrypi/'.
cce6292 linux-raspberrypi_4.9.bb: Upgrade to 4.9.10
c34a6b0 linux-raspberrypi_4.4: Update to 4.4.48
7398030 Revert "u-boot: drop patch to include lowlevel_init"
69c5675 README: Mention CM1 and CM3 support
56b0c59 rpi-base.inc: Include dtb file for CM1 and CM3
a735477 raspberrypi*.conf: Minor tweaks
9923618 raspberrypi-cm3.conf: Add dummy machine for CM3 (alias for RPi2)
d5aa048 raspberrypi-cm.conf: Add dummy machine for CM1 (alias for RPi1)
5b5c4d9 linux-raspberrypi_4.9: Update to 4.9.4
f81f022 linux-raspberrypi_4.4: Update to 4.4.43
263e6bd linux-raspberrypi: Drop v4.8
121e200 linux-raspberrypi: Drop v4.7
cb7068a linux-raspberrypi: Upgrade to v4.4.39
38bc324 linux-raspberrypi: Drop v4.1
e1f69da linux-raspberrypi_4.9.bb: Add recipe for 4.9 release
02c0d41 linux-raspberrypi_4.8.bb: Upgrade to 4.8.16
031e2695 u-boot: drop patch to include lowlevel_init
c405581 rpi-base.inc: remove input modules form XSERVER
d77f3d4 rpi-base.inc: add xserver-xorg-extension-glx to XSERVER for vc4 enabled
672e025 linux-raspberrypi-4.8: Upgrade to 4.8.15
1bf09a4 userland: Fix building on aarch64
22fb2b4 linux-raspberrypi-4.8: Upgrade to 4.8.13
90c45b4 userland: Update to latest
96b9c63 linux-raspberrypi-base.bbclass: remove version hack
17f0c23 linux-rpi.inc: Do not rely on DISTRO_TYPE to enable/disable kernel debug
064aa0a u-boot: Simplify boot script
0e66d69 linux-raspberrypi_4.8.bb: upgrade to 4.8.12
18cf04d firmware: Update to 20161125
1f64604 linux-raspberrypi_4.4.bb: upgrade to 4.4.35
44d41bf raspberrypi3.conf: fix typo for BCM43430
6bd1bfe linux-raspberrypi: remove not needed bundle_initramfs_append()
b030814 u-boot: Fix appending to RDEPENDS
9c12ac8 linux-raspberrypi_4.8.bb: Upgrade to 4.8.6
380740d linux-firmware_git.bbappend: Delete
a5f95f4 userland: Bump to latest and add ASNEEDED = ""
716b6a9 firmware: Use release tarballs
6c755af weston: Unify bbappends for weston into single file
b9e6f04 userland: Update to latest master tip
00300d9 firmware: Update to 20161030
3e6e890 linux-raspberrypi-4.4: Update to 4.4.28
12aa27d gstreamer1.0-plugins-bad_%.bbappend: Set PACKAGECONFIG_GL for RPi
ab39653 rpi-base.inc: Include pi3-disable-bt-overlay.dtb
17a6933 linux-raspberrypi: Update to 4.8.4
ddc9390 linux-firmware: Fix "No generic license file exists" warning
d51a8a7 linux-raspberrypi_4.8.bb: Update to 4.8.2
e991148 firmware: Update to latest
ed54bd3 linux-firmware: Correct the LICENSE for brcm43430-license
3360f98 sdcard_image-rpi.bbclass: Include boot script when using u-boot
1d629b1 u-boot: Add RDEPENDS on rpi-u-boot-scr
56047ad rpi-u-boot-scr: Add recipe to create u-boot boot script
1f24992 rpi-base.inc: Don't install kernel image into rootfs
c62e088 eglinfo-x11: align to VC4
1ebb370 vc4: why no framebuffer device?
8d17669 xorg align for vc4
3b9aebd mesa: align for vc4
de016ce bluez5: correctly append brcm43438 service
b6c954d Fix DISPMANX_OFFLINE variable typo
d778d0a README: Replace references to Redmine with Github Issues
1e3983f linux-raspberrypi_4.7.bb: Update to 4.7.7
ecd8875 linux-raspberrypi: Add recipe for 4.8 release
05be947 firmware: Upgrade to latest
585838e userland: Upgrade to latest
41689e8 sdcard_image-rpi.bbclass: Remove redundant RPI_KERNEL_VERSION
5697e77 linux-raspberrypi_4.4: Upgrade to 4.4.23
4817e2c sdcard_image-rpi.bbclass: avoid corrupted images with latest oe-core
ac6f357 weston: Fix typo with override
760ddd0 Switch to using 4.4 as default kernel
ed84c2c vc4graphics: Support X11 with the VC4 driver.
55388a5 firmware, userland: Bump to latest
b24afdc linux-raspberrypi_3.18: Remove
e993bdc linux-raspberrypi: Add recipe for 4.7 release
c2f7643 linux-raspberrypi_4.4: upgrade to 4.4.16
d511c7c linux-raspberrypi-4.4: add patch to enable proper operation of renderD128 device
ef22ff4 linux-rpi.inc: add the configuration options required to support vc4graphics
6b4de2b mesa_%.bbappend: new file to add the correct configuration options to support vc4graphics
bee7643 weston/weston_%.bbappend: modify configuration options to support vc4graphics
72b9635 wayland/weston_%.bbappend: modify configuration options to support vc4graphics
ba9c466 rpi-config_git.bb: add v4c overlay to config.txt to support vc4graphics
5d2722c raspberrypi3.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
824b78c raspberrypi2.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
dfce95f raspberrypi0.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
224b9e9 raspberrypi.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
0035bc8 rpi-base.inc: add vc4-kms-v3d to the overlays to support vc4graphics
6e535dd rpi-default-providers.inc: change default providers to support vc4graphics
1a32817 sdcard_image-rpi.bbclass: support for .dtbo files for dtb overlays
d98f2a7 linux-raspberrypi-base.bbclass: support for .dtbo files for dtb overlays
09b76a4 rpi-base.inc: support for .dtbo files for dtb overlays
18a2fb6 linux-raspberrypi_4.4.bb: support for .dtbo files for dtb overlays
a5f9b07 bcm2835: Compile examples correct LDFLAGS to avoid HASH errors
8c5eba1 bcm2835: Update to 1.50
5229f75 wiringPi: Fix compilation of libraries
5771c7f wiringpi: Fix prepend space
1b2c25e wiringpi: Update to 2.32
4c02c7c sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
cc64d63 userland: Add bash to RDEPENDS
Change-Id: Ic9e50299fcba012068cea0c0a971c48c6da4138f
git-subtree-dir: import-layers/meta-raspberrypi
git-subtree-split: cce6292e41493158c26f5b1b7fded97faacf10d7
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/import-layers/meta-raspberrypi/classes/sdcard_image-rpi.bbclass b/import-layers/meta-raspberrypi/classes/sdcard_image-rpi.bbclass
index 57cefea..116d5e8 100644
--- a/import-layers/meta-raspberrypi/classes/sdcard_image-rpi.bbclass
+++ b/import-layers/meta-raspberrypi/classes/sdcard_image-rpi.bbclass
@@ -47,7 +47,7 @@
# Use an uncompressed ext3 by default as rootfs
SDIMG_ROOTFS_TYPE ?= "ext3"
-SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
+SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
IMAGE_DEPENDS_rpi-sdimg = " \
parted-native \
@@ -59,7 +59,7 @@
"
# SD card image name
-SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg"
+SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg"
# Compression method to apply to SDIMG after it has been created. Supported
# compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg file
@@ -71,10 +71,6 @@
# Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
FATPAYLOAD ?= ""
-IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}"
-IMAGE_CMD_rpi-sdimg[vardepsexclude] += "IMAGEDATESTAMP"
-IMAGE_CMD_rpi-sdimg[vardepsexclude] += "DATETIME"
-
IMAGE_CMD_rpi-sdimg () {
# Align partitions
@@ -85,7 +81,7 @@
echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB"
# Check if we are building with device tree support
- DTS="${@get_dts(d, None)}"
+ DTS="${@get_dts(d)}"
# Initialize sdcard image file
dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
@@ -105,7 +101,7 @@
mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
if test -n "${DTS}"; then
- # Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' string and will be put in a dedicated folder
+ # Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' (4.1.x) or by '.dtbo' (4.4.9+) string and will be put in a dedicated folder
DT_OVERLAYS="${@split_overlays(d, 0)}"
DT_ROOT="${@split_overlays(d, 1)}"
@@ -119,15 +115,17 @@
# Copy device tree overlays to dedicated folder
mmd -i ${WORKDIR}/boot.img overlays
for DTB in ${DT_OVERLAYS}; do
- DTB_BASE_NAME=`basename ${DTB} .dtb`
+ DTB_EXT=${DTB##*.}
+ DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
- mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtb
+ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT} ::overlays/${DTB_BASE_NAME}.${DTB_EXT}
done
fi
case "${KERNEL_IMAGETYPE}" in
"uImage")
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_KERNELIMAGE}
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage
+ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::boot.scr
;;
*)
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::${SDIMG_KERNELIMAGE}
@@ -143,8 +141,8 @@
fi
# Add stamp file
- echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info
- mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info ::
+ echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info
+ mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}/image-version-info ::
# Burn Partitions
dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync