* [meta-raspberrypi][PATCH 0/6] Drop rpi-mkimage and use upstream u-boot
@ 2016-05-29 15:59 Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV Paul Barker
` (5 more replies)
0 siblings, 6 replies; 22+ messages in thread
From: Paul Barker @ 2016-05-29 15:59 UTC (permalink / raw)
To: yocto
Following discussion on the Raspberry Pi tools bug tracker it was found that
rpi-mkimage is no longer needed with recent firmware. It can therefore be
dropped from the layer completely.
Whilst looking into this I also found that the u-boot-rpi recipe in
meta-raspberrypi can now be replaced by direct use of the mainline u-boot recipe
from oe-core. The 2016.03 release of u-boot supports the original Raspberry Pi
and the Raspberry Pi 2. Configuration of the u-boot environment to directly boot
the uImage file on the SD card must still be done manually - I'm going to look
into making this work by default in the near future.
Build and boot tested on an old Raspberry Pi Model B (rev 2):
* linux-raspberrypi 4.1
* linux-raspberrypi 4.4
* u-boot 2016.03 + linux-raspberrypi 4.1
U-boot commands needed for my board (the dtb at least may need to change for
other models):
setenv fdtfile bcm2807-rpi-b.dtb
setenv bootargs 'earlyprintk console=tty0 console=ttyAMA0 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait noinitrd'
setenv do_load_files 'mmc dev 0; fatload mmc 0:1 ${kernel_addr_r} uImage; fatload mmc 0:1 ${fdt_addr_r} ${fdtfile};'
setenv do_boot_files 'bootm ${kernel_addr_r} - ${fdt_addr_r};'
setenv bootcmd 'run do_load_files do_boot_files'
saveenv
boot
During testing it was found that linux-raspberrypi 3.18 no longer builds and so
this was dropped from the layer.
Paul Barker (6):
linux-raspberrypi: Allow override of PV
linux-raspberrypi: rpi-mkimage is no longer needed
u-boot: Use mainline u-boot recipe from oe-core
rpi-mkimage: Remove unused recipe
linux-raspberrypi: Drop version 3.18
sdcard_image-rpi: Always install dtb files
classes/sdcard_image-rpi.bbclass | 42 ++++----
conf/machine/include/rpi-default-providers.inc | 1 -
conf/machine/raspberrypi.conf | 2 +
conf/machine/raspberrypi2.conf | 2 +
recipes-bsp/rpi-mkimage/rpi-mkimage/License | 25 -----
.../open-files-relative-to-script.patch | 17 ----
recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb | 22 -----
recipes-bsp/u-boot/u-boot-rpi_git.bb | 29 ------
.../0001-dts-add-overlay-for-pitft22.patch | 110 ---------------------
recipes-kernel/linux/linux-raspberrypi.inc | 19 ----
recipes-kernel/linux/linux-raspberrypi_3.18.bb | 14 ---
recipes-kernel/linux/linux-raspberrypi_4.1.bb | 1 +
recipes-kernel/linux/linux-raspberrypi_4.4.bb | 1 +
13 files changed, 27 insertions(+), 258 deletions(-)
delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage/License
delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
delete mode 100644 recipes-bsp/u-boot/u-boot-rpi_git.bb
delete mode 100644 recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.18.bb
--
2.1.4
^ permalink raw reply [flat|nested] 22+ messages in thread
* [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-05-29 15:59 [meta-raspberrypi][PATCH 0/6] Drop rpi-mkimage and use upstream u-boot Paul Barker
@ 2016-05-29 15:59 ` Paul Barker
2016-05-29 18:20 ` Khem Raj
2016-06-15 0:17 ` Andrei Gherzan
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 2/6] linux-raspberrypi: rpi-mkimage is no longer needed Paul Barker
` (4 subsequent siblings)
5 siblings, 2 replies; 22+ messages in thread
From: Paul Barker @ 2016-05-29 15:59 UTC (permalink / raw)
To: yocto
PV is now set in each version of the linux-raspberrypi recipe instead of in
linux-raspberrypi.inc. This allows linux-raspberrypi.inc to be used in custom
kernel recipes in another layer which require a different PV value.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
recipes-kernel/linux/linux-raspberrypi.inc | 1 -
recipes-kernel/linux/linux-raspberrypi_3.18.bb | 1 +
recipes-kernel/linux/linux-raspberrypi_4.1.bb | 1 +
recipes-kernel/linux/linux-raspberrypi_4.4.bb | 1 +
4 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index 4799c74..dd477cd 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -13,7 +13,6 @@ SRC_URI += " \
COMPATIBLE_MACHINE = "raspberrypi"
PE = "1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
# NOTE: For now we pull in the default config from the RPi kernel GIT tree.
KERNEL_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig"
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.18.bb b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
index 1110b71..b16a1d7 100644
--- a/recipes-kernel/linux/linux-raspberrypi_3.18.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
@@ -1,6 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
LINUX_VERSION ?= "3.18.16"
+PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV = "1bb18c8f721ef674a447f3622273f2e2de7a205c"
SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.1.bb b/recipes-kernel/linux/linux-raspberrypi_4.1.bb
index 79fac66..9e1572e 100644
--- a/recipes-kernel/linux/linux-raspberrypi_4.1.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_4.1.bb
@@ -1,6 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
LINUX_VERSION ?= "4.1.21"
+PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV = "ff45bc0e8917c77461b2901e2743e6339bb70413"
SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.1.y \
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.4.bb b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
index ba47b22..12bb43a 100644
--- a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
@@ -1,6 +1,7 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
LINUX_VERSION ?= "4.4.9"
+PV = "${LINUX_VERSION}+git${SRCPV}"
SRCREV = "3b440738b5c1adc3ec3ee72ceca799d1b8d264df"
SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-raspberrypi][PATCH 2/6] linux-raspberrypi: rpi-mkimage is no longer needed
2016-05-29 15:59 [meta-raspberrypi][PATCH 0/6] Drop rpi-mkimage and use upstream u-boot Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV Paul Barker
@ 2016-05-29 15:59 ` Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 3/6] u-boot: Use mainline u-boot recipe from oe-core Paul Barker
` (3 subsequent siblings)
5 siblings, 0 replies; 22+ messages in thread
From: Paul Barker @ 2016-05-29 15:59 UTC (permalink / raw)
To: yocto
Recent versions of the Raspberry Pi firmware can directly handle kernel images
which use device tree. The modifications made by rpi-mkimage are no longer
needed.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
recipes-kernel/linux/linux-raspberrypi.inc | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index dd477cd..c6bb8e8 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -34,13 +34,6 @@ python __anonymous () {
kerneltype = d.getVar('KERNEL_IMAGETYPE', True)
kerneldt = get_dts(d, d.getVar('LINUX_VERSION', True))
d.setVar("KERNEL_DEVICETREE", kerneldt)
-
- # Add dependency to 'rpi-mkimage-native' package only if RPi bootloader is used with DT-enable kernel
- if kerneldt:
- if kerneltype != 'uImage' and len(kerneldt.strip()) > 1:
- depends = d.getVar("DEPENDS", True)
- depends = "%s rpi-mkimage-native" % depends
- d.setVar("DEPENDS", depends)
}
do_kernel_configme_prepend() {
@@ -61,15 +54,6 @@ do_deploy_append() {
echo "${CMDLINE}${PITFT_PARAMS}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt
}
-do_rpiboot_mkimage() {
- if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
- if test -n "${KERNEL_DEVICETREE}"; then
- # Add RPi bootloader trailer to kernel image to enable DeviceTree support
- ${STAGING_BINDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
- fi
- fi
-}
-
do_bundle_initramfs_append() {
if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
@@ -80,5 +64,3 @@ do_bundle_initramfs_append() {
fi
fi
}
-
-addtask rpiboot_mkimage before do_install after do_compile
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-raspberrypi][PATCH 3/6] u-boot: Use mainline u-boot recipe from oe-core
2016-05-29 15:59 [meta-raspberrypi][PATCH 0/6] Drop rpi-mkimage and use upstream u-boot Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 2/6] linux-raspberrypi: rpi-mkimage is no longer needed Paul Barker
@ 2016-05-29 15:59 ` Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 4/6] rpi-mkimage: Remove unused recipe Paul Barker
` (2 subsequent siblings)
5 siblings, 0 replies; 22+ messages in thread
From: Paul Barker @ 2016-05-29 15:59 UTC (permalink / raw)
To: yocto
The repository used by u-boot-rpi has not been updated since 2012. In the
meantime, mailine u-boot has gained Raspberry Pi support. All we need to do is
set UBOOT_MACHINE to an appropriate value in the machine config files.
Currently configs are only provided for raspberrypi and raspberrypi2. The master
branch of u-boot now also appears to have a config file for raspberrypi3 so
support for this can be added in the future when u-boot is upgraded in oe-core.
The mainline u-boot recipe creates the file "u-boot.bin" instead of
"u-boot.img".
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
classes/sdcard_image-rpi.bbclass | 2 +-
conf/machine/include/rpi-default-providers.inc | 1 -
conf/machine/raspberrypi.conf | 2 ++
conf/machine/raspberrypi2.conf | 2 ++
recipes-bsp/u-boot/u-boot-rpi_git.bb | 29 --------------------------
5 files changed, 5 insertions(+), 31 deletions(-)
delete mode 100644 recipes-bsp/u-boot/u-boot-rpi_git.bb
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 4dfd7a3..20bd314 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -105,7 +105,7 @@ IMAGE_CMD_rpi-sdimg () {
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
case "${KERNEL_IMAGETYPE}" in
"uImage")
- mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.img ::${SDIMG_KERNELIMAGE}
+ 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
;;
*)
diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc
index cabbd43..359870d 100644
--- a/conf/machine/include/rpi-default-providers.inc
+++ b/conf/machine/include/rpi-default-providers.inc
@@ -1,7 +1,6 @@
# RaspberryPi BSP default providers
PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-rpi"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/egl ?= "userland"
PREFERRED_PROVIDER_virtual/libgles2 ?= "userland"
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index 0f95f1a..72beeb8 100644
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -8,3 +8,5 @@ require conf/machine/include/tune-arm1176jzf-s.inc
include conf/machine/include/rpi-base.inc
SERIAL_CONSOLE = "115200 ttyAMA0"
+
+UBOOT_MACHINE = "rpi_config"
diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
index b6346e6..d50ef70 100644
--- a/conf/machine/raspberrypi2.conf
+++ b/conf/machine/raspberrypi2.conf
@@ -8,3 +8,5 @@ require conf/machine/include/tune-cortexa7.inc
include conf/machine/include/rpi-base.inc
SERIAL_CONSOLE = "115200 ttyAMA0"
+
+UBOOT_MACHINE = "rpi_2_config"
diff --git a/recipes-bsp/u-boot/u-boot-rpi_git.bb b/recipes-bsp/u-boot/u-boot-rpi_git.bb
deleted file mode 100644
index 3e8d377..0000000
--- a/recipes-bsp/u-boot/u-boot-rpi_git.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "U-Boot port for RaspberryPi"
-
-require recipes-bsp/u-boot/u-boot.inc
-
-DEPENDS += "rpi-mkimage-native"
-
-PROVIDES += "u-boot"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
-
-SRCREV = "6709570cdc947c2a546f96d571551acf4474778c"
-SRC_URI = "git://github.com/gonzoua/u-boot-pi.git;branch=rpi"
-
-S = "${WORKDIR}/git"
-
-UBOOT_MACHINE = "rpi_b"
-UBOOT_MAKE_TARGET = "u-boot.bin"
-UBOOT_SUFFIX = "img"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-COMPATIBLE_MACHINE = "raspberrypi"
-
-do_compile_append() {
- # Create kernel.img from uboot.bin and name it u-boot.img
- ${STAGING_BINDIR_NATIVE}/imagetool-uncompressed.py u-boot.bin
- mv kernel.img u-boot.img
-}
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-raspberrypi][PATCH 4/6] rpi-mkimage: Remove unused recipe
2016-05-29 15:59 [meta-raspberrypi][PATCH 0/6] Drop rpi-mkimage and use upstream u-boot Paul Barker
` (2 preceding siblings ...)
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 3/6] u-boot: Use mainline u-boot recipe from oe-core Paul Barker
@ 2016-05-29 15:59 ` Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 5/6] linux-raspberrypi: Drop version 3.18 Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 6/6] sdcard_image-rpi: Always install dtb files Paul Barker
5 siblings, 0 replies; 22+ messages in thread
From: Paul Barker @ 2016-05-29 15:59 UTC (permalink / raw)
To: yocto
The rpi-mkimage tools are no longer used. Recent Raspberry Pi firmware can
directly boot a Linux kernel image using device tree and mainline u-boot
supports Raspberry Pi without the use of these tools.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
recipes-bsp/rpi-mkimage/rpi-mkimage/License | 25 ----------------------
.../open-files-relative-to-script.patch | 17 ---------------
recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb | 22 -------------------
3 files changed, 64 deletions(-)
delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage/License
delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
diff --git a/recipes-bsp/rpi-mkimage/rpi-mkimage/License b/recipes-bsp/rpi-mkimage/rpi-mkimage/License
deleted file mode 100644
index 2582681..0000000
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage/License
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2012, Broadcom Europe Ltd
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the copyright holder nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch b/recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
deleted file mode 100644
index fa9e88b..0000000
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-When using open, use path relative to imagetool-uncompressed.py
-
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-
-Index: git/mkimage/imagetool-uncompressed.py
-===================================================================
---- a/mkimage/imagetool-uncompressed.py
-+++ b/mkimage/imagetool-uncompressed.py
-@@ -18,7 +18,7 @@ re_line = re.compile(r"0x(?P<value>[0-9a
- mem = [0 for i in range(32768)]
-
- def load_to_mem(name, addr):
-- f = open(name)
-+ f = open(os.path.dirname(__file__) + '/' + name)
-
- for l in f.readlines():
- m = re_line.match(l)
diff --git a/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb b/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
deleted file mode 100644
index cce91d7..0000000
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "RaspberryPi tool to produce kernel.img"
-LICENSE = "Broadcom"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/License;md5=957f6640d5e2d2acfce73a36a56cb32f"
-SECTION = "bootloader"
-
-DEPENDS = "python"
-
-SRCREV = "f5642106425d430e1f82ee064121a5fd0e05a386"
-SRC_URI = " \
- git://github.com/raspberrypi/tools.git;branch=master;protocol=git \
- file://License \
- file://open-files-relative-to-script.patch \
-"
-
-S = "${WORKDIR}/git"
-
-do_install () {
- install -d ${D}${bindir}
- install -t ${D}${bindir} mkimage/*
-}
-
-BBCLASSEXTEND = "native"
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-raspberrypi][PATCH 5/6] linux-raspberrypi: Drop version 3.18
2016-05-29 15:59 [meta-raspberrypi][PATCH 0/6] Drop rpi-mkimage and use upstream u-boot Paul Barker
` (3 preceding siblings ...)
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 4/6] rpi-mkimage: Remove unused recipe Paul Barker
@ 2016-05-29 15:59 ` Paul Barker
2016-05-29 18:17 ` Khem Raj
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 6/6] sdcard_image-rpi: Always install dtb files Paul Barker
5 siblings, 1 reply; 22+ messages in thread
From: Paul Barker @ 2016-05-29 15:59 UTC (permalink / raw)
To: yocto
The linux-raspberrypi v3.18 recipe does not build after commit
519c387e3b97ecc21ac1d7b4fc9197298f289a71 as it lacks the necessary dtb files.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
.../0001-dts-add-overlay-for-pitft22.patch | 110 ---------------------
recipes-kernel/linux/linux-raspberrypi_3.18.bb | 15 ---
2 files changed, 125 deletions(-)
delete mode 100644 recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.18.bb
diff --git a/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch b/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
deleted file mode 100644
index fa73599..0000000
--- a/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 2f44861e2a2d651a9aa62a75343a032fee33e93b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <petter@technux.se>
-Date: Fri, 8 Jan 2016 09:02:44 +0100
-Subject: [PATCH] dts: add overlay for pitft22 in linux 3.18
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Add the pitft22 overlay from adafruit Adafruit-Pi-Kernel-o-Matic repo:
-https://github.com/adafruit/Adafruit-Pi-Kernel-o-Matic
-
-Signed-off-by: Petter Mabäcker <petter@technux.se>
----
- arch/arm/boot/dts/overlays/Makefile | 1 +
- arch/arm/boot/dts/overlays/pitft22-overlay.dts | 69 ++++++++++++++++++++++++++
- 2 files changed, 70 insertions(+)
- create mode 100755 arch/arm/boot/dts/overlays/pitft22-overlay.dts
-
-diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index c766616..1eaaf81 100644
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -27,6 +27,7 @@ dtb-$(RPI_DT_OVERLAYS) += mcp2515-can0-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += mmc-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += mz61581-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += piscreen-overlay.dtb
-+dtb-$(RPI_DT_OVERLAYS) += pitft22-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += pitft28-resistive-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += rpi-dac-overlay.dtb
-diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
-new file mode 100755
-index 0000000..894ba22
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
-@@ -0,0 +1,69 @@
-+/*
-+ * Device Tree overlay for pitft by Adafruit
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+ compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
-+
-+ fragment@0 {
-+ target = <&spi0>;
-+ __overlay__ {
-+ status = "okay";
-+
-+ spidev@0{
-+ status = "disabled";
-+ };
-+
-+ spidev@1{
-+ status = "disabled";
-+ };
-+ };
-+ };
-+
-+ fragment@1 {
-+ target = <&gpio>;
-+ __overlay__ {
-+ pitft_pins: pitft_pins {
-+ brcm,pins = <25>;
-+ brcm,function = <1>; /* out */
-+ brcm,pull = <0>; /* none */
-+ };
-+ };
-+ };
-+
-+ fragment@2 {
-+ target = <&spi0>;
-+ __overlay__ {
-+ /* needed to avoid dtc warning */
-+ #address-cells = <1>;
-+ #size-cells = <0>;
-+
-+ pitft: pitft@0{
-+ compatible = "ilitek,ili9340";
-+ reg = <0>;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pitft_pins>;
-+
-+ spi-max-frequency = <32000000>;
-+ rotate = <90>;
-+ fps = <25>;
-+ bgr;
-+ buswidth = <8>;
-+ dc-gpios = <&gpio 25 0>;
-+ debug = <0>;
-+ };
-+
-+ };
-+ };
-+
-+ __overrides__ {
-+ speed = <&pitft>,"spi-max-frequency:0";
-+ rotate = <&pitft>,"rotate:0";
-+ fps = <&pitft>,"fps:0";
-+ debug = <&pitft>,"debug:0";
-+ };
-+};
---
-1.9.1
-
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.18.bb b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
deleted file mode 100644
index b16a1d7..0000000
--- a/recipes-kernel/linux/linux-raspberrypi_3.18.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-
-LINUX_VERSION ?= "3.18.16"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRCREV = "1bb18c8f721ef674a447f3622273f2e2de7a205c"
-SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \
- file://0001-dts-add-overlay-for-pitft22.patch \
- "
-require linux-raspberrypi.inc
-
-# Create missing out of tree 'overlays' directory prior to install step
-do_compile_prepend() {
- mkdir -p ${B}/arch/arm/boot/dts/overlays
-}
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [meta-raspberrypi][PATCH 6/6] sdcard_image-rpi: Always install dtb files
2016-05-29 15:59 [meta-raspberrypi][PATCH 0/6] Drop rpi-mkimage and use upstream u-boot Paul Barker
` (4 preceding siblings ...)
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 5/6] linux-raspberrypi: Drop version 3.18 Paul Barker
@ 2016-05-29 15:59 ` Paul Barker
5 siblings, 0 replies; 22+ messages in thread
From: Paul Barker @ 2016-05-29 15:59 UTC (permalink / raw)
To: yocto
We now need dtb files when booting via u-boot.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
classes/sdcard_image-rpi.bbclass | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 20bd314..3b4f13f 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -103,32 +103,32 @@ IMAGE_CMD_rpi-sdimg () {
rm -f ${WORKDIR}/boot.img
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
+ DT_OVERLAYS="${@split_overlays(d, 0)}"
+ DT_ROOT="${@split_overlays(d, 1)}"
+
+ # Copy board device trees to root folder
+ for DTB in ${DT_ROOT}; do
+ DTB_BASE_NAME=`basename ${DTB} .dtb`
+
+ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::${DTB_BASE_NAME}.dtb
+ done
+
+ # 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`
+
+ mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtb
+ 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
;;
*)
- 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
- DT_OVERLAYS="${@split_overlays(d, 0)}"
- DT_ROOT="${@split_overlays(d, 1)}"
-
- # Copy board device trees to root folder
- for DTB in ${DT_ROOT}; do
- DTB_BASE_NAME=`basename ${DTB} .dtb`
-
- mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::${DTB_BASE_NAME}.dtb
- done
-
- # 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`
-
- mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtb
- done
- fi
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::${SDIMG_KERNELIMAGE}
;;
esac
--
2.1.4
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 5/6] linux-raspberrypi: Drop version 3.18
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 5/6] linux-raspberrypi: Drop version 3.18 Paul Barker
@ 2016-05-29 18:17 ` Khem Raj
2016-05-30 7:47 ` Paul Barker
0 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2016-05-29 18:17 UTC (permalink / raw)
To: Paul Barker; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 6311 bytes --]
I think we should remove it. But lets give a chance for folks to respond if
any one is using 3.18 still
On May 29, 2016 9:07 AM, "Paul Barker" <paul@paulbarker.me.uk> wrote:
> The linux-raspberrypi v3.18 recipe does not build after commit
> 519c387e3b97ecc21ac1d7b4fc9197298f289a71 as it lacks the necessary dtb
> files.
>
> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> ---
> .../0001-dts-add-overlay-for-pitft22.patch | 110
> ---------------------
> recipes-kernel/linux/linux-raspberrypi_3.18.bb | 15 ---
> 2 files changed, 125 deletions(-)
> delete mode 100644
> recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
> delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.18.bb
>
> diff --git
> a/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
> b/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
> deleted file mode 100644
> index fa73599..0000000
> ---
> a/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
> +++ /dev/null
> @@ -1,110 +0,0 @@
> -From 2f44861e2a2d651a9aa62a75343a032fee33e93b Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <petter@technux.se>
> -Date: Fri, 8 Jan 2016 09:02:44 +0100
> -Subject: [PATCH] dts: add overlay for pitft22 in linux 3.18
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Upstream-Status: Pending
> -
> -Add the pitft22 overlay from adafruit Adafruit-Pi-Kernel-o-Matic repo:
> -https://github.com/adafruit/Adafruit-Pi-Kernel-o-Matic
> -
> -Signed-off-by: Petter Mabäcker <petter@technux.se>
> ----
> - arch/arm/boot/dts/overlays/Makefile | 1 +
> - arch/arm/boot/dts/overlays/pitft22-overlay.dts | 69
> ++++++++++++++++++++++++++
> - 2 files changed, 70 insertions(+)
> - create mode 100755 arch/arm/boot/dts/overlays/pitft22-overlay.dts
> -
> -diff --git a/arch/arm/boot/dts/overlays/Makefile
> b/arch/arm/boot/dts/overlays/Makefile
> -index c766616..1eaaf81 100644
> ---- a/arch/arm/boot/dts/overlays/Makefile
> -+++ b/arch/arm/boot/dts/overlays/Makefile
> -@@ -27,6 +27,7 @@ dtb-$(RPI_DT_OVERLAYS) += mcp2515-can0-overlay.dtb
> - dtb-$(RPI_DT_OVERLAYS) += mmc-overlay.dtb
> - dtb-$(RPI_DT_OVERLAYS) += mz61581-overlay.dtb
> - dtb-$(RPI_DT_OVERLAYS) += piscreen-overlay.dtb
> -+dtb-$(RPI_DT_OVERLAYS) += pitft22-overlay.dtb
> - dtb-$(RPI_DT_OVERLAYS) += pitft28-resistive-overlay.dtb
> - dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb
> - dtb-$(RPI_DT_OVERLAYS) += rpi-dac-overlay.dtb
> -diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts
> b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
> -new file mode 100755
> -index 0000000..894ba22
> ---- /dev/null
> -+++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
> -@@ -0,0 +1,69 @@
> -+/*
> -+ * Device Tree overlay for pitft by Adafruit
> -+ *
> -+ */
> -+
> -+/dts-v1/;
> -+/plugin/;
> -+
> -+/ {
> -+ compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
> -+
> -+ fragment@0 {
> -+ target = <&spi0>;
> -+ __overlay__ {
> -+ status = "okay";
> -+
> -+ spidev@0{
> -+ status = "disabled";
> -+ };
> -+
> -+ spidev@1{
> -+ status = "disabled";
> -+ };
> -+ };
> -+ };
> -+
> -+ fragment@1 {
> -+ target = <&gpio>;
> -+ __overlay__ {
> -+ pitft_pins: pitft_pins {
> -+ brcm,pins = <25>;
> -+ brcm,function = <1>; /* out */
> -+ brcm,pull = <0>; /* none */
> -+ };
> -+ };
> -+ };
> -+
> -+ fragment@2 {
> -+ target = <&spi0>;
> -+ __overlay__ {
> -+ /* needed to avoid dtc warning */
> -+ #address-cells = <1>;
> -+ #size-cells = <0>;
> -+
> -+ pitft: pitft@0{
> -+ compatible = "ilitek,ili9340";
> -+ reg = <0>;
> -+ pinctrl-names = "default";
> -+ pinctrl-0 = <&pitft_pins>;
> -+
> -+ spi-max-frequency = <32000000>;
> -+ rotate = <90>;
> -+ fps = <25>;
> -+ bgr;
> -+ buswidth = <8>;
> -+ dc-gpios = <&gpio 25 0>;
> -+ debug = <0>;
> -+ };
> -+
> -+ };
> -+ };
> -+
> -+ __overrides__ {
> -+ speed = <&pitft>,"spi-max-frequency:0";
> -+ rotate = <&pitft>,"rotate:0";
> -+ fps = <&pitft>,"fps:0";
> -+ debug = <&pitft>,"debug:0";
> -+ };
> -+};
> ---
> -1.9.1
> -
> diff --git a/recipes-kernel/linux/linux-raspberrypi_3.18.bb
> b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
> deleted file mode 100644
> index b16a1d7..0000000
> --- a/recipes-kernel/linux/linux-raspberrypi_3.18.bb
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
> -
> -LINUX_VERSION ?= "3.18.16"
> -PV = "${LINUX_VERSION}+git${SRCPV}"
> -
> -SRCREV = "1bb18c8f721ef674a447f3622273f2e2de7a205c"
> -SRC_URI = "git://
> github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \
> - file://0001-dts-add-overlay-for-pitft22.patch \
> - "
> -require linux-raspberrypi.inc
> -
> -# Create missing out of tree 'overlays' directory prior to install step
> -do_compile_prepend() {
> - mkdir -p ${B}/arch/arm/boot/dts/overlays
> -}
> --
> 2.1.4
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>
[-- Attachment #2: Type: text/html, Size: 8642 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV Paul Barker
@ 2016-05-29 18:20 ` Khem Raj
2016-05-30 8:11 ` Paul Barker
2016-06-15 0:17 ` Andrei Gherzan
1 sibling, 1 reply; 22+ messages in thread
From: Khem Raj @ 2016-05-29 18:20 UTC (permalink / raw)
To: Paul Barker; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 3073 bytes --]
On May 29, 2016 9:00 AM, "Paul Barker" <paul@paulbarker.me.uk> wrote:
>
> PV is now set in each version of the linux-raspberrypi recipe instead of
in
> linux-raspberrypi.inc. This allows linux-raspberrypi.inc to be used in
custom
> kernel recipes in another layer which require a different PV value.
You can also use weak define. Instead of duplicated value in each recipe
>
> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> ---
> recipes-kernel/linux/linux-raspberrypi.inc | 1 -
> recipes-kernel/linux/linux-raspberrypi_3.18.bb | 1 +
> recipes-kernel/linux/linux-raspberrypi_4.1.bb | 1 +
> recipes-kernel/linux/linux-raspberrypi_4.4.bb | 1 +
> 4 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc
b/recipes-kernel/linux/linux-raspberrypi.inc
> index 4799c74..dd477cd 100644
> --- a/recipes-kernel/linux/linux-raspberrypi.inc
> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
> @@ -13,7 +13,6 @@ SRC_URI += " \
> COMPATIBLE_MACHINE = "raspberrypi"
>
> PE = "1"
> -PV = "${LINUX_VERSION}+git${SRCPV}"
>
> # NOTE: For now we pull in the default config from the RPi kernel GIT
tree.
> KERNEL_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig"
> diff --git a/recipes-kernel/linux/linux-raspberrypi_3.18.bb
b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
> index 1110b71..b16a1d7 100644
> --- a/recipes-kernel/linux/linux-raspberrypi_3.18.bb
> +++ b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
> @@ -1,6 +1,7 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
>
> LINUX_VERSION ?= "3.18.16"
> +PV = "${LINUX_VERSION}+git${SRCPV}"
>
> SRCREV = "1bb18c8f721ef674a447f3622273f2e2de7a205c"
> SRC_URI = "git://
github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \
> diff --git a/recipes-kernel/linux/linux-raspberrypi_4.1.bb
b/recipes-kernel/linux/linux-raspberrypi_4.1.bb
> index 79fac66..9e1572e 100644
> --- a/recipes-kernel/linux/linux-raspberrypi_4.1.bb
> +++ b/recipes-kernel/linux/linux-raspberrypi_4.1.bb
> @@ -1,6 +1,7 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
>
> LINUX_VERSION ?= "4.1.21"
> +PV = "${LINUX_VERSION}+git${SRCPV}"
>
> SRCREV = "ff45bc0e8917c77461b2901e2743e6339bb70413"
> SRC_URI = "git://
github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.1.y \
> diff --git a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
> index ba47b22..12bb43a 100644
> --- a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
> +++ b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
> @@ -1,6 +1,7 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
>
> LINUX_VERSION ?= "4.4.9"
> +PV = "${LINUX_VERSION}+git${SRCPV}"
>
> SRCREV = "3b440738b5c1adc3ec3ee72ceca799d1b8d264df"
> SRC_URI = "git://
github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \
> --
> 2.1.4
>
> --
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
,
[-- Attachment #2: Type: text/html, Size: 4953 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 5/6] linux-raspberrypi: Drop version 3.18
2016-05-29 18:17 ` Khem Raj
@ 2016-05-30 7:47 ` Paul Barker
0 siblings, 0 replies; 22+ messages in thread
From: Paul Barker @ 2016-05-30 7:47 UTC (permalink / raw)
To: Khem Raj; +Cc: yocto
On Sun, 29 May 2016 21:17:29 +0300
Khem Raj <raj.khem@gmail.com> wrote:
> I think we should remove it. But lets give a chance for folks to
> respond if any one is using 3.18 still
> On May 29, 2016 9:07 AM, "Paul Barker" <paul@paulbarker.me.uk> wrote:
>
> > The linux-raspberrypi v3.18 recipe does not build after commit
> > 519c387e3b97ecc21ac1d7b4fc9197298f289a71 as it lacks the necessary
> > dtb files.
> >
> > Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
I'll drop this from the patch series for now so that we can get the
other changes in.
Thanks,
Paul Barker
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-05-29 18:20 ` Khem Raj
@ 2016-05-30 8:11 ` Paul Barker
2016-05-30 17:58 ` Khem Raj
0 siblings, 1 reply; 22+ messages in thread
From: Paul Barker @ 2016-05-30 8:11 UTC (permalink / raw)
To: Khem Raj; +Cc: yocto
On Sun, 29 May 2016 21:20:21 +0300
Khem Raj <raj.khem@gmail.com> wrote:
> On May 29, 2016 9:00 AM, "Paul Barker" <paul@paulbarker.me.uk> wrote:
> >
> > PV is now set in each version of the linux-raspberrypi recipe
> > instead of
> in
> > linux-raspberrypi.inc. This allows linux-raspberrypi.inc to be used
> > in
> custom
> > kernel recipes in another layer which require a different PV value.
>
> You can also use weak define. Instead of duplicated value in each
> recipe
Weak define doesn't work here as PV is already weakly defined based on
the recipe filename and that's what we're trying to override. We end up
with PV values like "4.1" instead of "4.1.21+git..." if "?=" is used.
Thanks,
Paul Barker
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-05-30 8:11 ` Paul Barker
@ 2016-05-30 17:58 ` Khem Raj
2016-05-30 22:16 ` Paul Barker
0 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2016-05-30 17:58 UTC (permalink / raw)
To: Paul Barker; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 921 bytes --]
On May 30, 2016 1:09 AM, "Paul Barker" <paul@paulbarker.me.uk> wrote:
>
> On Sun, 29 May 2016 21:20:21 +0300
> Khem Raj <raj.khem@gmail.com> wrote:
>
> > On May 29, 2016 9:00 AM, "Paul Barker" <paul@paulbarker.me.uk> wrote:
> > >
> > > PV is now set in each version of the linux-raspberrypi recipe
> > > instead of
> > in
> > > linux-raspberrypi.inc. This allows linux-raspberrypi.inc to be used
> > > in
> > custom
> > > kernel recipes in another layer which require a different PV value.
> >
> > You can also use weak define. Instead of duplicated value in each
> > recipe
>
> Weak define doesn't work here as PV is already weakly defined based on
> the recipe filename and that's what we're trying to override. We end up
> with PV values like "4.1" instead of "4.1.21+git..." if "?=" is used.
What issue do we have if we ask custom recipes to define LINUX_VERSION
>
> Thanks,
> Paul Barker
[-- Attachment #2: Type: text/html, Size: 1387 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-05-30 17:58 ` Khem Raj
@ 2016-05-30 22:16 ` Paul Barker
2016-05-31 7:39 ` Khem Raj
0 siblings, 1 reply; 22+ messages in thread
From: Paul Barker @ 2016-05-30 22:16 UTC (permalink / raw)
To: Khem Raj; +Cc: yocto
On Mon, 30 May 2016 20:58:53 +0300
Khem Raj <raj.khem@gmail.com> wrote:
> On May 30, 2016 1:09 AM, "Paul Barker" <paul@paulbarker.me.uk> wrote:
> >
> > On Sun, 29 May 2016 21:20:21 +0300
> > Khem Raj <raj.khem@gmail.com> wrote:
> >
> > > On May 29, 2016 9:00 AM, "Paul Barker" <paul@paulbarker.me.uk>
> > > wrote:
> > > >
> > > > PV is now set in each version of the linux-raspberrypi recipe
> > > > instead of
> > > in
> > > > linux-raspberrypi.inc. This allows linux-raspberrypi.inc to be
> > > > used in
> > > custom
> > > > kernel recipes in another layer which require a different PV
> > > > value.
> > >
> > > You can also use weak define. Instead of duplicated value in each
> > > recipe
> >
> > Weak define doesn't work here as PV is already weakly defined based
> > on the recipe filename and that's what we're trying to override. We
> > end up with PV values like "4.1" instead of "4.1.21+git..." if "?="
> > is used.
>
> What issue do we have if we ask custom recipes to define LINUX_VERSION
I'm trying to build from a source archive instead of a git repository
(to avoid a ~1.3GB git clone operation) so the use of ${SRCPV} is
causing me trouble.
Thanks,
Paul Barker
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-05-30 22:16 ` Paul Barker
@ 2016-05-31 7:39 ` Khem Raj
2016-06-01 17:55 ` Paul Barker
0 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2016-05-31 7:39 UTC (permalink / raw)
To: Paul Barker; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]
On May 30, 2016 3:15 PM, "Paul Barker" <paul@paulbarker.me.uk> wrote:
>
> On Mon, 30 May 2016 20:58:53 +0300
> Khem Raj <raj.khem@gmail.com> wrote:
>
> > On May 30, 2016 1:09 AM, "Paul Barker" <paul@paulbarker.me.uk> wrote:
> > >
> > > On Sun, 29 May 2016 21:20:21 +0300
> > > Khem Raj <raj.khem@gmail.com> wrote:
> > >
> > > > On May 29, 2016 9:00 AM, "Paul Barker" <paul@paulbarker.me.uk>
> > > > wrote:
> > > > >
> > > > > PV is now set in each version of the linux-raspberrypi recipe
> > > > > instead of
> > > > in
> > > > > linux-raspberrypi.inc. This allows linux-raspberrypi.inc to be
> > > > > used in
> > > > custom
> > > > > kernel recipes in another layer which require a different PV
> > > > > value.
> > > >
> > > > You can also use weak define. Instead of duplicated value in each
> > > > recipe
> > >
> > > Weak define doesn't work here as PV is already weakly defined based
> > > on the recipe filename and that's what we're trying to override. We
> > > end up with PV values like "4.1" instead of "4.1.21+git..." if "?="
> > > is used.
> >
> > What issue do we have if we ask custom recipes to define LINUX_VERSION
>
> I'm trying to build from a source archive instead of a git repository
> (to avoid a ~1.3GB git clone operation) so the use of ${SRCPV} is
> causing me trouble.
>
Can you override the whole PV
> Thanks,
> Paul Barker
[-- Attachment #2: Type: text/html, Size: 2224 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-05-31 7:39 ` Khem Raj
@ 2016-06-01 17:55 ` Paul Barker
2016-06-02 7:59 ` Ionel Badisor
0 siblings, 1 reply; 22+ messages in thread
From: Paul Barker @ 2016-06-01 17:55 UTC (permalink / raw)
To: Khem Raj; +Cc: yocto
On Tue, 31 May 2016 10:39:03 +0300
Khem Raj <raj.khem@gmail.com> wrote:
> On May 30, 2016 3:15 PM, "Paul Barker" <paul@paulbarker.me.uk> wrote:
> >
> >
> > I'm trying to build from a source archive instead of a git
> > repository (to avoid a ~1.3GB git clone operation) so the use of
> > ${SRCPV} is causing me trouble.
> >
>
> Can you override the whole PV
I've given this another look and I can get the recipe to parse if I
require linux-raspberrypi.inc before setting PV instead of afterwards.
However do_kernel_configme then gets confused looking for a
"standard/raspberrypi" configuration. It only works if I modify
linux-raspberrypi.inc as per my patch and set PV before requiring that
include file.
I'm starting to think that I might be doing something wrong here - is
there a supported way to build a kernel from an archive instead of a
git repository within OE?
Thanks,
Paul Barker
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-06-01 17:55 ` Paul Barker
@ 2016-06-02 7:59 ` Ionel Badisor
2016-06-02 21:25 ` Paul Barker
0 siblings, 1 reply; 22+ messages in thread
From: Ionel Badisor @ 2016-06-02 7:59 UTC (permalink / raw)
To: Paul Barker; +Cc: yocto
On 06/01/2016 08:55 PM, Paul Barker wrote:
> On Tue, 31 May 2016 10:39:03 +0300
> Khem Raj <raj.khem@gmail.com> wrote:
>
>> On May 30, 2016 3:15 PM, "Paul Barker" <paul@paulbarker.me.uk> wrote:
>>>
>>>
>>> I'm trying to build from a source archive instead of a git
>>> repository (to avoid a ~1.3GB git clone operation) so the use of
>>> ${SRCPV} is causing me trouble.
>>>
>>
>> Can you override the whole PV
>
> I've given this another look and I can get the recipe to parse if I
> require linux-raspberrypi.inc before setting PV instead of afterwards.
> However do_kernel_configme then gets confused looking for a
> "standard/raspberrypi" configuration. It only works if I modify
> linux-raspberrypi.inc as per my patch and set PV before requiring that
> include file.
>
> I'm starting to think that I might be doing something wrong here - is
> there a supported way to build a kernel from an archive instead of a
> git repository within OE?
>
> Thanks,
> Paul Barker
>
Are you trying to avoid repeated cloning operation to save bandwith and
time or you are trying to save disk space?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-06-02 7:59 ` Ionel Badisor
@ 2016-06-02 21:25 ` Paul Barker
2016-06-03 6:07 ` Ionel Badisor
0 siblings, 1 reply; 22+ messages in thread
From: Paul Barker @ 2016-06-02 21:25 UTC (permalink / raw)
To: Ionel Badisor; +Cc: yocto
On Thu, 2 Jun 2016 10:59:37 +0300
Ionel Badisor <ionelbadisor@gmail.com> wrote:
> On 06/01/2016 08:55 PM, Paul Barker wrote:
> > On Tue, 31 May 2016 10:39:03 +0300
> > Khem Raj <raj.khem@gmail.com> wrote:
> >
> >> On May 30, 2016 3:15 PM, "Paul Barker" <paul@paulbarker.me.uk>
> >> wrote:
> >>>
> >>>
> >>> I'm trying to build from a source archive instead of a git
> >>> repository (to avoid a ~1.3GB git clone operation) so the use of
> >>> ${SRCPV} is causing me trouble.
> >>>
> >>
> >> Can you override the whole PV
> >
> > I've given this another look and I can get the recipe to parse if I
> > require linux-raspberrypi.inc before setting PV instead of
> > afterwards. However do_kernel_configme then gets confused looking
> > for a "standard/raspberrypi" configuration. It only works if I
> > modify linux-raspberrypi.inc as per my patch and set PV before
> > requiring that include file.
> >
> > I'm starting to think that I might be doing something wrong here -
> > is there a supported way to build a kernel from an archive instead
> > of a git repository within OE?
> >
> > Thanks,
> > Paul Barker
> >
> Are you trying to avoid repeated cloning operation to save bandwith
> and time or you are trying to save disk space?
I'm trying to reduce "time to first build" on a new build machine as
well as the amount of space/bandwidth needed to mirror downloaded
files.
Instead of setting PV in each recipe I could just duplicate
linux-raspberrypi.inc into my own layer with the change I need. That's
probably the simplest approach for now, I'll just have to keep my eye
on meta-raspberrypi going forward for any changes to
linux-raspberrypi.inc which I'd need to incorporate.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-06-02 21:25 ` Paul Barker
@ 2016-06-03 6:07 ` Ionel Badisor
2016-06-03 19:47 ` Paul Barker
0 siblings, 1 reply; 22+ messages in thread
From: Ionel Badisor @ 2016-06-03 6:07 UTC (permalink / raw)
To: Paul Barker; +Cc: yocto
On 06/03/2016 12:25 AM, Paul Barker wrote:
> On Thu, 2 Jun 2016 10:59:37 +0300
> Ionel Badisor <ionelbadisor@gmail.com> wrote:
>
>> On 06/01/2016 08:55 PM, Paul Barker wrote:
>>> On Tue, 31 May 2016 10:39:03 +0300
>>> Khem Raj <raj.khem@gmail.com> wrote:
>>>
>>>> On May 30, 2016 3:15 PM, "Paul Barker" <paul@paulbarker.me.uk>
>>>> wrote:
>>>>>
>>>>>
>>>>> I'm trying to build from a source archive instead of a git
>>>>> repository (to avoid a ~1.3GB git clone operation) so the use of
>>>>> ${SRCPV} is causing me trouble.
>>>>>
>>>>
>>>> Can you override the whole PV
>>>
>>> I've given this another look and I can get the recipe to parse if I
>>> require linux-raspberrypi.inc before setting PV instead of
>>> afterwards. However do_kernel_configme then gets confused looking
>>> for a "standard/raspberrypi" configuration. It only works if I
>>> modify linux-raspberrypi.inc as per my patch and set PV before
>>> requiring that include file.
>>>
>>> I'm starting to think that I might be doing something wrong here -
>>> is there a supported way to build a kernel from an archive instead
>>> of a git repository within OE?
>>>
>>> Thanks,
>>> Paul Barker
>>>
>> Are you trying to avoid repeated cloning operation to save bandwith
>> and time or you are trying to save disk space?
>
> I'm trying to reduce "time to first build" on a new build machine as
> well as the amount of space/bandwidth needed to mirror downloaded
> files.
>
> Instead of setting PV in each recipe I could just duplicate
> linux-raspberrypi.inc into my own layer with the change I need. That's
> probably the simplest approach for now, I'll just have to keep my eye
> on meta-raspberrypi going forward for any changes to
> linux-raspberrypi.inc which I'd need to incorporate.
>
Maybe you can use the `DL_DIR ?= "/path/to/downloads/"` in your
conf/local.conf file for multiple build directories and if you want you
can copy downloads directory to new machine and point to it the new
local.conf then all do_fetch operations are already performed, except
new changes in which case the git fetch operation is performed when git
is used and takes less time then when fetching entire archive.
note: multiple builds on same machine can use same downloads directory.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-06-03 6:07 ` Ionel Badisor
@ 2016-06-03 19:47 ` Paul Barker
2016-06-15 0:23 ` Andrei Gherzan
0 siblings, 1 reply; 22+ messages in thread
From: Paul Barker @ 2016-06-03 19:47 UTC (permalink / raw)
To: Ionel Badisor; +Cc: yocto
On Fri, 3 Jun 2016 09:07:37 +0300
Ionel Badisor <ionelbadisor@gmail.com> wrote:
> On 06/03/2016 12:25 AM, Paul Barker wrote:
> > On Thu, 2 Jun 2016 10:59:37 +0300
> > Ionel Badisor <ionelbadisor@gmail.com> wrote:
> >
> >> On 06/01/2016 08:55 PM, Paul Barker wrote:
> >>> On Tue, 31 May 2016 10:39:03 +0300
> >>> Khem Raj <raj.khem@gmail.com> wrote:
> >>>
> >>>> On May 30, 2016 3:15 PM, "Paul Barker" <paul@paulbarker.me.uk>
> >>>> wrote:
> >>>>>
> >>>>>
> >>>>> I'm trying to build from a source archive instead of a git
> >>>>> repository (to avoid a ~1.3GB git clone operation) so the use of
> >>>>> ${SRCPV} is causing me trouble.
> >>>>>
> >>>>
> >>>> Can you override the whole PV
> >>>
> >>> I've given this another look and I can get the recipe to parse if
> >>> I require linux-raspberrypi.inc before setting PV instead of
> >>> afterwards. However do_kernel_configme then gets confused looking
> >>> for a "standard/raspberrypi" configuration. It only works if I
> >>> modify linux-raspberrypi.inc as per my patch and set PV before
> >>> requiring that include file.
> >>>
> >>> I'm starting to think that I might be doing something wrong here -
> >>> is there a supported way to build a kernel from an archive instead
> >>> of a git repository within OE?
> >>>
> >>> Thanks,
> >>> Paul Barker
> >>>
> >> Are you trying to avoid repeated cloning operation to save bandwith
> >> and time or you are trying to save disk space?
> >
> > I'm trying to reduce "time to first build" on a new build machine as
> > well as the amount of space/bandwidth needed to mirror downloaded
> > files.
> >
> > Instead of setting PV in each recipe I could just duplicate
> > linux-raspberrypi.inc into my own layer with the change I need.
> > That's probably the simplest approach for now, I'll just have to
> > keep my eye on meta-raspberrypi going forward for any changes to
> > linux-raspberrypi.inc which I'd need to incorporate.
> >
> Maybe you can use the `DL_DIR ?= "/path/to/downloads/"` in your
> conf/local.conf file for multiple build directories and if you want
> you can copy downloads directory to new machine and point to it the
> new local.conf then all do_fetch operations are already performed,
> except new changes in which case the git fetch operation is performed
> when git is used and takes less time then when fetching entire
> archive.
>
> note: multiple builds on same machine can use same downloads
> directory.
I'm planning to release this as part of a distro layer in the future.
Not all build machines will be under my control if others use the
layer.
I'm going to drop this patch for now as I can maintain my own copy of
linux-raspberrypi.inc. I think it'd be good to get the other changes
into master.
V2 incoming.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV Paul Barker
2016-05-29 18:20 ` Khem Raj
@ 2016-06-15 0:17 ` Andrei Gherzan
1 sibling, 0 replies; 22+ messages in thread
From: Andrei Gherzan @ 2016-06-15 0:17 UTC (permalink / raw)
To: Paul Barker; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 2980 bytes --]
On Sun, May 29, 2016 at 04:59:08PM +0100, Paul Barker wrote:
> PV is now set in each version of the linux-raspberrypi recipe instead of in
> linux-raspberrypi.inc. This allows linux-raspberrypi.inc to be used in custom
> kernel recipes in another layer which require a different PV value.
>
> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> ---
> recipes-kernel/linux/linux-raspberrypi.inc | 1 -
> recipes-kernel/linux/linux-raspberrypi_3.18.bb | 1 +
> recipes-kernel/linux/linux-raspberrypi_4.1.bb | 1 +
> recipes-kernel/linux/linux-raspberrypi_4.4.bb | 1 +
> 4 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
> index 4799c74..dd477cd 100644
> --- a/recipes-kernel/linux/linux-raspberrypi.inc
> +++ b/recipes-kernel/linux/linux-raspberrypi.inc
> @@ -13,7 +13,6 @@ SRC_URI += " \
> COMPATIBLE_MACHINE = "raspberrypi"
>
> PE = "1"
> -PV = "${LINUX_VERSION}+git${SRCPV}"
>
> # NOTE: For now we pull in the default config from the RPi kernel GIT tree.
> KERNEL_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig"
> diff --git a/recipes-kernel/linux/linux-raspberrypi_3.18.bb b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
> index 1110b71..b16a1d7 100644
> --- a/recipes-kernel/linux/linux-raspberrypi_3.18.bb
> +++ b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
> @@ -1,6 +1,7 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
>
> LINUX_VERSION ?= "3.18.16"
> +PV = "${LINUX_VERSION}+git${SRCPV}"
>
> SRCREV = "1bb18c8f721ef674a447f3622273f2e2de7a205c"
> SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \
> diff --git a/recipes-kernel/linux/linux-raspberrypi_4.1.bb b/recipes-kernel/linux/linux-raspberrypi_4.1.bb
> index 79fac66..9e1572e 100644
> --- a/recipes-kernel/linux/linux-raspberrypi_4.1.bb
> +++ b/recipes-kernel/linux/linux-raspberrypi_4.1.bb
> @@ -1,6 +1,7 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
>
> LINUX_VERSION ?= "4.1.21"
> +PV = "${LINUX_VERSION}+git${SRCPV}"
>
> SRCREV = "ff45bc0e8917c77461b2901e2743e6339bb70413"
> SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.1.y \
> diff --git a/recipes-kernel/linux/linux-raspberrypi_4.4.bb b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
> index ba47b22..12bb43a 100644
> --- a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
> +++ b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
> @@ -1,6 +1,7 @@
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
>
> LINUX_VERSION ?= "4.4.9"
> +PV = "${LINUX_VERSION}+git${SRCPV}"
>
> SRCREV = "3b440738b5c1adc3ec3ee72ceca799d1b8d264df"
> SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \
I'm not really happy in duplicating PV. Wouldn't a weak assignment work
for you? PV ?= "${LINUX_VERSION}+git${SRCPV}" . So you can overwrite it
as you want.
--
Andrei Gherzan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-06-03 19:47 ` Paul Barker
@ 2016-06-15 0:23 ` Andrei Gherzan
2016-06-15 11:10 ` Paul Barker
0 siblings, 1 reply; 22+ messages in thread
From: Andrei Gherzan @ 2016-06-15 0:23 UTC (permalink / raw)
To: Paul Barker; +Cc: yocto, Ionel Badisor
[-- Attachment #1: Type: text/plain, Size: 3256 bytes --]
On Fri, Jun 03, 2016 at 08:47:45PM +0100, Paul Barker wrote:
> On Fri, 3 Jun 2016 09:07:37 +0300
> Ionel Badisor <ionelbadisor@gmail.com> wrote:
>
> > On 06/03/2016 12:25 AM, Paul Barker wrote:
> > > On Thu, 2 Jun 2016 10:59:37 +0300
> > > Ionel Badisor <ionelbadisor@gmail.com> wrote:
> > >
> > >> On 06/01/2016 08:55 PM, Paul Barker wrote:
> > >>> On Tue, 31 May 2016 10:39:03 +0300
> > >>> Khem Raj <raj.khem@gmail.com> wrote:
> > >>>
> > >>>> On May 30, 2016 3:15 PM, "Paul Barker" <paul@paulbarker.me.uk>
> > >>>> wrote:
> > >>>>>
> > >>>>>
> > >>>>> I'm trying to build from a source archive instead of a git
> > >>>>> repository (to avoid a ~1.3GB git clone operation) so the use of
> > >>>>> ${SRCPV} is causing me trouble.
> > >>>>>
> > >>>>
> > >>>> Can you override the whole PV
> > >>>
> > >>> I've given this another look and I can get the recipe to parse if
> > >>> I require linux-raspberrypi.inc before setting PV instead of
> > >>> afterwards. However do_kernel_configme then gets confused looking
> > >>> for a "standard/raspberrypi" configuration. It only works if I
> > >>> modify linux-raspberrypi.inc as per my patch and set PV before
> > >>> requiring that include file.
> > >>>
> > >>> I'm starting to think that I might be doing something wrong here -
> > >>> is there a supported way to build a kernel from an archive instead
> > >>> of a git repository within OE?
> > >>>
> > >>> Thanks,
> > >>> Paul Barker
> > >>>
> > >> Are you trying to avoid repeated cloning operation to save bandwith
> > >> and time or you are trying to save disk space?
> > >
> > > I'm trying to reduce "time to first build" on a new build machine as
> > > well as the amount of space/bandwidth needed to mirror downloaded
> > > files.
> > >
> > > Instead of setting PV in each recipe I could just duplicate
> > > linux-raspberrypi.inc into my own layer with the change I need.
> > > That's probably the simplest approach for now, I'll just have to
> > > keep my eye on meta-raspberrypi going forward for any changes to
> > > linux-raspberrypi.inc which I'd need to incorporate.
> > >
> > Maybe you can use the `DL_DIR ?= "/path/to/downloads/"` in your
> > conf/local.conf file for multiple build directories and if you want
> > you can copy downloads directory to new machine and point to it the
> > new local.conf then all do_fetch operations are already performed,
> > except new changes in which case the git fetch operation is performed
> > when git is used and takes less time then when fetching entire
> > archive.
> >
> > note: multiple builds on same machine can use same downloads
> > directory.
>
> I'm planning to release this as part of a distro layer in the future.
> Not all build machines will be under my control if others use the
> layer.
>
> I'm going to drop this patch for now as I can maintain my own copy of
> linux-raspberrypi.inc. I think it'd be good to get the other changes
> into master.
>
> V2 incoming.
I managed to follow the discussion. Sorry for my last reply on this.
I don't think the solution would be to manage a custom inc file. We need
to find a solution with this. Can I see and try your changes for the
arhive?
--
Andrei Gherzan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV
2016-06-15 0:23 ` Andrei Gherzan
@ 2016-06-15 11:10 ` Paul Barker
0 siblings, 0 replies; 22+ messages in thread
From: Paul Barker @ 2016-06-15 11:10 UTC (permalink / raw)
To: Andrei Gherzan; +Cc: yocto, Ionel Badisor
On Wed, 15 Jun 2016 01:23:39 +0100
Andrei Gherzan <andrei@gherzan.ro> wrote:
> On Fri, Jun 03, 2016 at 08:47:45PM +0100, Paul Barker wrote:
> > On Fri, 3 Jun 2016 09:07:37 +0300
> > Ionel Badisor <ionelbadisor@gmail.com> wrote:
> >
> > > On 06/03/2016 12:25 AM, Paul Barker wrote:
> > > > On Thu, 2 Jun 2016 10:59:37 +0300
> > > > Ionel Badisor <ionelbadisor@gmail.com> wrote:
> > > >
> > > >> On 06/01/2016 08:55 PM, Paul Barker wrote:
> > > >>> On Tue, 31 May 2016 10:39:03 +0300
> > > >>> Khem Raj <raj.khem@gmail.com> wrote:
> > > >>>
> > > >>>> On May 30, 2016 3:15 PM, "Paul Barker"
> > > >>>> <paul@paulbarker.me.uk> wrote:
> > > >>>>>
> > > >>>>>
> > > >>>>> I'm trying to build from a source archive instead of a git
> > > >>>>> repository (to avoid a ~1.3GB git clone operation) so the
> > > >>>>> use of ${SRCPV} is causing me trouble.
> > > >>>>>
> > > >>>>
> > > >>>> Can you override the whole PV
> > > >>>
> > > >>> I've given this another look and I can get the recipe to
> > > >>> parse if I require linux-raspberrypi.inc before setting PV
> > > >>> instead of afterwards. However do_kernel_configme then gets
> > > >>> confused looking for a "standard/raspberrypi" configuration.
> > > >>> It only works if I modify linux-raspberrypi.inc as per my
> > > >>> patch and set PV before requiring that include file.
> > > >>>
> > > >>> I'm starting to think that I might be doing something wrong
> > > >>> here - is there a supported way to build a kernel from an
> > > >>> archive instead of a git repository within OE?
> > > >>>
> > > >>> Thanks,
> > > >>> Paul Barker
> > > >>>
> > > >> Are you trying to avoid repeated cloning operation to save
> > > >> bandwith and time or you are trying to save disk space?
> > > >
> > > > I'm trying to reduce "time to first build" on a new build
> > > > machine as well as the amount of space/bandwidth needed to
> > > > mirror downloaded files.
> > > >
> > > > Instead of setting PV in each recipe I could just duplicate
> > > > linux-raspberrypi.inc into my own layer with the change I need.
> > > > That's probably the simplest approach for now, I'll just have to
> > > > keep my eye on meta-raspberrypi going forward for any changes to
> > > > linux-raspberrypi.inc which I'd need to incorporate.
> > > >
> > > Maybe you can use the `DL_DIR ?= "/path/to/downloads/"` in your
> > > conf/local.conf file for multiple build directories and if you
> > > want you can copy downloads directory to new machine and point to
> > > it the new local.conf then all do_fetch operations are already
> > > performed, except new changes in which case the git fetch
> > > operation is performed when git is used and takes less time then
> > > when fetching entire archive.
> > >
> > > note: multiple builds on same machine can use same downloads
> > > directory.
> >
> > I'm planning to release this as part of a distro layer in the
> > future. Not all build machines will be under my control if others
> > use the layer.
> >
> > I'm going to drop this patch for now as I can maintain my own copy
> > of linux-raspberrypi.inc. I think it'd be good to get the other
> > changes into master.
> >
> > V2 incoming.
>
> I managed to follow the discussion. Sorry for my last reply on this.
>
> I don't think the solution would be to manage a custom inc file. We
> need to find a solution with this. Can I see and try your changes for
> the arhive?
>
I've sent a V2 series without this patch and without dropping the
3.18.y kernel recipe. I think the simplest approach would be to merge
that series and then come back to this afterwards so that there aren't
too many different sets of patches flying around.
My recipe and inc file is now public if you want to look at it:
https://gitlab.com/oryx/meta-oryx/tree/master/recipes-kernel/linux
Thanks,
Paul Barker
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2016-06-15 11:17 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-29 15:59 [meta-raspberrypi][PATCH 0/6] Drop rpi-mkimage and use upstream u-boot Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 1/6] linux-raspberrypi: Allow override of PV Paul Barker
2016-05-29 18:20 ` Khem Raj
2016-05-30 8:11 ` Paul Barker
2016-05-30 17:58 ` Khem Raj
2016-05-30 22:16 ` Paul Barker
2016-05-31 7:39 ` Khem Raj
2016-06-01 17:55 ` Paul Barker
2016-06-02 7:59 ` Ionel Badisor
2016-06-02 21:25 ` Paul Barker
2016-06-03 6:07 ` Ionel Badisor
2016-06-03 19:47 ` Paul Barker
2016-06-15 0:23 ` Andrei Gherzan
2016-06-15 11:10 ` Paul Barker
2016-06-15 0:17 ` Andrei Gherzan
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 2/6] linux-raspberrypi: rpi-mkimage is no longer needed Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 3/6] u-boot: Use mainline u-boot recipe from oe-core Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 4/6] rpi-mkimage: Remove unused recipe Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 5/6] linux-raspberrypi: Drop version 3.18 Paul Barker
2016-05-29 18:17 ` Khem Raj
2016-05-30 7:47 ` Paul Barker
2016-05-29 15:59 ` [meta-raspberrypi][PATCH 6/6] sdcard_image-rpi: Always install dtb files Paul Barker
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.