Skip to contentSkip to conversation

Pending patches from O.S. Systems tree

PATCH Applied Otavio Salvador 2 participants 5 messages Aug 20, 2011 – Aug 22, 2011

lore
Share & tools
lore
#0 lore raw

cover Pending patches from O.S. Systems tree

The following changes since commit 3d0b866967529a14268541b85e79cb35981e1aed:

xdotool: import from OE rev 5350bbef01b8979617e3d0fd38939f94f1fa5315 (2011-08-17 23:11:55 +0200)

are available in the git repository at:
git://github.com/OSSystems/meta-oe master
https://github.com/OSSystems/meta-oe/tree/master

Otavio Salvador (3):
freerdp: bump SRCREV to gather major RemoteFX improvements kernel.bbclass: fix spacing to reduce delta between oe-core and
meta-oe
kernel.bbclass: save kernel image name into $kerneldir

 meta-oe/classes/kernel.bbclass                 |   15 ++++++++++-----
 meta-oe/recipes-support/freerdp/freerdp_git.bb |    2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 1/3 freerdp: bump SRCREV to gather major RemoteFX improvements

---
 meta-oe/recipes-support/freerdp/freerdp_git.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-oe/recipes-support/freerdp/freerdp_git.bb +1 -1
index a3f4a03..3df1e07 100644
@@ -9,7 +9,7 @@ PV = "gitr${SRCPV}"
 PKGV = "${GITPKGVTAG}"
 PR = "${INC_PR}.2"
 
-SRCREV = "d1eef40acc994d85cb78c0a98914edc097c9b44d"
+SRCREV = "b05747b55ccea8d2f2b830f89d3c0eb622d66784"
 SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;protocol=git"
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.7.2.5
#2 lore raw

PATCH 2/3 kernel.bbclass: fix spacing to reduce delta between oe-core and meta-oe

In reply to Otavio Salvador
---
 meta-oe/classes/kernel.bbclass |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
meta-oe/classes/kernel.bbclass +4 -5
index 8629133..f67503a 100644
@@ -19,12 +19,12 @@ python __anonymous () {
 
     image = bb.data.getVar('INITRAMFS_IMAGE', d, True)
     if image:
-        bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d)
+    	bb.data.setVar('INITRAMFS_TASK', '${INITRAMFS_IMAGE}:do_rootfs', d)
 
     machine_kernel_pr = bb.data.getVar('MACHINE_KERNEL_PR', d, True)
 
     if machine_kernel_pr:
-       bb.data.setVar('PR', machine_kernel_pr, d)
+    	bb.data.setVar('PR', machine_kernel_pr, d)
 }
 
 inherit kernel-arch deploy
@@ -189,11 +189,10 @@ kernel_do_configure() {
 	if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then
 		cp "${WORKDIR}/defconfig" "${B}/.config"
 	fi
-
-	yes '' | oe_runmake oldconfig
+        yes '' | oe_runmake oldconfig
 
 	if [ ! -z "${INITRAMFS_IMAGE}" ]; then
-		for img in cpio.gz cpio.lzo cpio.lzma cpio.xz ; do
+		for img in cpio.gz cpio.lzo cpio.lzma cpio.xz; do
 		if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then
 			cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" initramfs.$img
 		fi
Signature · 1 line
1.7.2.5
#3 lore raw

PATCH 3/3 kernel.bbclass: save kernel image name into $kerneldir

In reply to Otavio Salvador

Save the kernel image name into sysroot so it can be used during image build if need. This is used by O.S. Systems products and probably useful to others.

---
 meta-oe/classes/kernel.bbclass |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
meta-oe/classes/kernel.bbclass +6 -0
index f67503a..f19e744 100644
@@ -134,6 +134,12 @@ kernel_do_install() {
 	echo "${KERNEL_VERSION}" > $kerneldir/kernel-abiversion
 
 	#
+	# Store kernel image name to allow use during image generation
+	#
+
+	echo "${KERNEL_IMAGE_BASE_NAME}" >$kerneldir/kernel-image-name
+
+	#
 	# Copy the entire source tree. In case an external build directory is
 	# used, copy the build directory over first, then copy over the source
 	# dir. This ensures the original Makefiles are used and not the
Signature · 1 line
1.7.2.5
Applied
#4 lore raw
In reply to Otavio Salvador

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 20-08-11 07:10, Otavio Salvador schreef:

Quoted 7 lines

The following changes since commit 3d0b866967529a14268541b85e79cb35981e1aed:

xdotool: import from OE rev 5350bbef01b8979617e3d0fd38939f94f1fa5315 (2011-08-17 23:11:55 +0200)

are available in the git repository at: git://github.com/OSSystems/meta-oe master https://github.com/OSSystems/meta-oe/tree/master

Otavio Salvador (3): freerdp: bump SRCREV to gather major RemoteFX improvements kernel.bbclass: fix spacing to reduce delta between oe-core and meta-oe kernel.bbclass: save kernel image name into $kerneldir

merged, thanks
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOUrYqMkyGM64RGpERAvdeAJ4gyQe7G3rziFZ1SOLEiOBUGxXDCwCdH928 qhrGENVtnbowIN2RWIeuFbc=
=qgQX
-----END PGP SIGNATURE-----