Pending patches on O.S. Systems tree

PATCH Applied Otavio Salvador 3 participants 9 messages Jul 11, 2011 – Jul 12, 2011

lore

Share & tools

lore

Otavio Salvador

author

2011-07-11 17:31 UTC #0 lore raw

cover Pending patches on O.S. Systems tree

The following changes since commit 4f36a7f698de5056cb38641a7bf12921dba7d962:

libx11: enable xcb support (2011-07-08 23:01:54 +0100)

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

Chris Larson (2):
Rework how the devshell functions
oe.terminal: improve how we spawn screen

Otavio Salvador (3):
fix SDK building due TARGET_ARCH use in installation path
libarchive: remove undistributable copyright content from source
cmake: update to 2.8.5 release

 meta/classes/devshell.bbclass                      |   26 ++---
 meta/classes/populate_sdk.bbclass                  |    2 +-
 meta/classes/terminal.bbclass                      |   30 ++++++
 meta/conf/bitbake.conf                             |    2 +-
 meta/lib/oe/classutils.py                          |    2 +
 meta/lib/oe/terminal.py                            |  107 ++++++++++++++++++++
 meta/recipes-devtools/cmake/cmake-native_2.8.5.bb  |   11 +--
 meta/recipes-devtools/cmake/cmake_2.8.5.bb         |   11 +--
 ...rchive_2.8.4.bb => libarchive_2.8.4.yocto.1.bb} |    8 +-
 9 files changed, 161 insertions(+), 38 deletions(-)
 create mode 100644 meta/classes/terminal.bbclass
 create mode 100644 meta/lib/oe/terminal.py
 rename meta/recipes-extended/libarchive/{libarchive_2.8.4.bb => libarchive_2.8.4.yocto.1.bb} (68%)

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-07-11 17:31 UTC #1 lore raw

PATCH 1/5 Rework how the devshell functions

From: Chris Larson <[email protected]>

In the new implementation, each known terminal is defined as a class in oe.terminal, as a subclass of bb.process.Popen. terminal.bbclass wraps this functionality, providing the metadata pieces. It obeys the OE_TERMINAL variable, which is a 'choice' typed variable. This variable may be 'auto', 'none', or any of the names of the defined terminals.

When using 'auto', or requesting an unsupported terminal, we attempt to spawn them in priority order until we get one that's available on this system (and in the case of the X terminals, has DISPLAY defined). The 'none' value is used when we're doing things like automated builds, and want to ensure that no terminal is *ever* spawned, under any circumstances.

Current available terminals:

gnome
konsole
xterm
rxvt
screen

Signed-off-by Chris Larson <[email protected]>

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/classes/devshell.bbclass |   26 ++++-------
 meta/classes/terminal.bbclass |   30 ++++++++++++
 meta/lib/oe/classutils.py     |    2 +
 meta/lib/oe/terminal.py       |  102 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 143 insertions(+), 17 deletions(-)
 create mode 100644 meta/classes/terminal.bbclass
 create mode 100644 meta/lib/oe/terminal.py

meta/classes/devshell.bbclass +9 ~~-17~~

index 5f262f4..7317d64 100644
@@ -1,22 +1,14 @@
-do_devshell[dirs] = "${S}"
-do_devshell[nostamp] = "1"
+inherit terminal
 
-XAUTHORITY ?= "${HOME}/.Xauthority"
 
-devshell_do_devshell() {
-	export DISPLAY='${DISPLAY}'
-	export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
-	export XAUTHORITY='${XAUTHORITY}'
-	export TERMWINDOWTITLE="Bitbake Developer Shell"
-	export EXTRA_OEMAKE='${EXTRA_OEMAKE}'
-	export SHELLCMDS="bash"
-	${TERMCMDRUN}
-	if [ $? -ne 0 ]; then
-	    echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."
-	    exit 1
-	fi
+export XAUTHORITY ?= "${HOME}/.Xauthority"
+export SHELL ?= 'bash'
+
+python do_devshell () {
+    oe_terminal(d.getVar('SHELL', True), 'OpenEmbedded Developer Shell', d)
 }
-addtask devshell after do_patch
 
-EXPORT_FUNCTIONS do_devshell
+addtask devshell after do_patch
 
+do_devshell[dirs] = "${S}"
+do_devshell[nostamp] = "1"

meta/classes/terminal.bbclass new file +30 -0

new file mode 100644
index 0000000..93646f7
@@ -0,0 +1,30 @@
+OE_TERMINAL ?= 'auto'
+OE_TERMINAL[type] = 'choice'
+OE_TERMINAL[choices] = 'auto none \
+                        ${@" ".join(o.name \
+                                    for o in oe.terminal.prioritized())}'
+
+
+def oe_terminal(command, title, d):
+    import oe.data
+    import oe.terminal
+
+    terminal = oe.data.typed_value('OE_TERMINAL', d).lower()
+    if terminal == 'none':
+        bb.fatal('Devshell usage disabled with OE_TERMINAL')
+    elif terminal != 'auto':
+        try:
+            oe.terminal.spawn(terminal, command, title)
+            return
+        except oe.terminal.UnsupportedTerminal:
+            bb.warn('Unsupported terminal "%s", defaulting to "auto"' %
+                    terminal)
+        except oe.terminal.ExecutionError as exc:
+            bb.fatal('Unable to spawn terminal %s: %s' % (terminal, exc))
+
+    try:
+        oe.terminal.spawn_preferred(command, title)
+    except oe.terminal.NoSupportedTerminals:
+        bb.fatal('No valid terminal found, unable to open devshell')
+    except oe.terminal.ExecutionError as exc:
+        bb.fatal('Unable to spawn terminal %s: %s' % (terminal, exc))

meta/lib/oe/classutils.py +2 -0

index 58188fd..42b0f49 100644
@@ -1,3 +1,5 @@
+__author__ = 'kergoth'
+
 class ClassRegistry(type):
     """Maintain a registry of classes, indexed by name.

meta/lib/oe/terminal.py new file +102 -0

102 lines not on this page · raw message

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-07-11 17:31 UTC #2 lore raw

PATCH 2/5 oe.terminal: improve how we spawn screen

In reply to Otavio Salvador

From: Chris Larson <[email protected]>

- Name the screen session 'devshell', to avoid confusion if running bitbake itself under a screen session.
- Display a warning message when spawning screen, so it's clear to the user that screen has been run (otherwise do_devshell just appears to hang).

Signed-off-by Chris Larson <[email protected]>

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/lib/oe/terminal.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

meta/lib/oe/terminal.py +6 -1

index 5336167..bbff8d0 100644
@@ -71,7 +71,12 @@ class Rxvt(XTerminal):
     priority = 1
 
 class Screen(Terminal):
-    command = 'screen -D -m -t "{title}" {command}'
+    command = 'screen -D -m -t "{title}" -S devshell {command}'
+
+    def __init__(self, command, title=None):
+        Terminal.__init__(self, command, title)
+        logger.warn('Screen started. Please connect in another terminal with '
+                    '"screen -r devshell"')
 
 
 def prioritized():

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-07-11 17:31 UTC #3 lore raw

PATCH 3/5 fix SDK building due TARGET_ARCH use in installation path

In reply to Otavio Salvador

TARGET_ARCH makes the building too fragile since it changes during building of target and nativesdk binaries thus making it difficult to handle a proper path for installation of binaries. The fix for it is to move it to toolchain tarball name.

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/classes/populate_sdk.bbclass |    2 +-
 meta/conf/bitbake.conf            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/classes/populate_sdk.bbclass +1 -1

index 089ed9a..03b6d0f 100644
@@ -9,7 +9,7 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}"
 
 TOOLCHAIN_HOST_TASK ?= "task-sdk-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
 TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg"
-TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
+TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-${SDK_ARCH}-${TARGET_ARCH}-toolchain-${DISTRO_VERSION}"
 
 RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
 DEPENDS = "virtual/fakeroot-native sed-native"

meta/conf/bitbake.conf +1 -1

index 463991d..eeb29a7 100644
@@ -341,7 +341,7 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
 
 PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
 
-SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
+SDK_NAME = "oecore-sdk-${DISTRO}"
 SDKPATH = "/usr/local/${SDK_NAME}"
 SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-07-11 17:31 UTC #4 lore raw

PATCH 4/5 libarchive: remove undistributable copyright content from source

In reply to Otavio Salvador

The original tarball has two undistributable files that we have removed from the repacked tarball. The issue has been reported upstream at:

http://code.google.com/p/libarchive/issues/detail?id=162

Signed-off-by Otavio Salvador <[email protected]>

---
 ...rchive_2.8.4.bb => libarchive_2.8.4.yocto.1.bb} |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/libarchive/{libarchive_2.8.4.bb => libarchive_2.8.4.yocto.1.bb} (68%)

meta/recipes-extended/libarchive/libarchive_2.8.4.yocto.1.bb renamed from meta/recipes-extended/libarchive/libarchive_2.8.4.bb +5 -3

similarity index 68%
rename from meta/recipes-extended/libarchive/libarchive_2.8.4.bb
rename to meta/recipes-extended/libarchive/libarchive_2.8.4.yocto.1.bb
index 6d4fb39..94d261b 100644
@@ -7,7 +7,9 @@ PR = "r0"
 
 DEPENDS = "libxml2"
 
-SRC_URI = "http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \
+# We need to repack the tarball due undistributable content on the upstream one.
+# More details at http://code.google.com/p/libarchive/issues/detail?id=162
+SRC_URI = "http://autobuilder.yoctoproject.org/sources/libarchive-${PV}.tar.gz \
            file://0001-Patch-from-upstream-revision-1990.patch \
            file://0002-Patch-from-upstream-revision-1991.patch \
            file://0003-Patch-from-upstream-rev-2516.patch \

@@ -17,8 +19,8 @@ SRC_URI = "http://libarchive.googlecode.com/files/libarchive-${PV}.tar.gz \
            file://0007-Ignore-ENOSYS-error-when-setting-up-xattrs.-Closes-5.patch \
            "
 
-SRC_URI[md5sum] = "83b237a542f27969a8d68ac217dc3796"
-SRC_URI[sha256sum] = "86cffa3eaa28d3116f5d0b20284026c3762cf4a2b52b9844df2b494d4a89f688"
+SRC_URI[md5sum] = "71242da5191f1218f13dd520d95a870e"
+SRC_URI[sha256sum] = "8cd55db11b1d6001ff8007e4d22b6f4a4bb215e70750e19ab44b84b99ab76053"
 
 inherit autotools lib_package

Signature · 1 line

1.7.2.5

Richard Purdie

Applied

2011-07-12 13:44 UTC #5 lore raw

Re: [PATCH 4/5] libarchive: remove undistributable copyright content from source

Quoted 7 lines · Otavio Salvador

The original tarball has two undistributable files that we have removed from the repacked tarball. The issue has been reported upstream at:
http://code.google.com/p/libarchive/issues/detail?id=162
Signed-off-by Otavio Salvador <[email protected]>

Merged to master, thanks.

Richard

Otavio Salvador

author

2011-07-11 17:31 UTC #6 lore raw

PATCH 5/5 cmake: update to 2.8.5 release

In reply to Otavio Salvador

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/recipes-devtools/cmake/cmake-native_2.8.5.bb |   11 +++--------
 meta/recipes-devtools/cmake/cmake_2.8.5.bb        |   11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

meta/recipes-devtools/cmake/cmake-native_2.8.5.bb +3 -8

index c8da1cb..3fe0c2e 100644
@@ -1,12 +1,7 @@
 require cmake.inc
 inherit native
 
-# This was need to keep version consistent - will be removed once 2.8.5 is released
-SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-2.8.5-rc3.tar.gz \
-           file://support-oe-qt4-tools-names.patch"
-S = "${WORKDIR}/cmake-2.8.5-rc3"
+PR = "${INC_PR}.1"
 
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "2d8018f8fa4c499e2c5b288d71660cba"
-SRC_URI[sha256sum] = "2987befc451f6404ea93bb99f00a38b80724fb655f121fed3bb0a08b65a771c8"
+SRC_URI[md5sum] = "3c5d32cec0f4c2dc45f4c2e84f4a20c5"
+SRC_URI[sha256sum] = "5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91"

meta/recipes-devtools/cmake/cmake_2.8.5.bb +3 -8

index 2a9a82c..64e7574 100644
@@ -4,17 +4,12 @@ inherit cmake
 
 DEPENDS += "curl expat zlib libarchive ncurses"
 
-PR = "${INC_PR}.0"
-
-# This was need to keep version consistent - will be removed once 2.8.5 is released
-SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-2.8.5-rc3.tar.gz \
-           file://support-oe-qt4-tools-names.patch"
-S = "${WORKDIR}/cmake-2.8.5-rc3"
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://dont-run-cross-binaries.patch"
 
-SRC_URI[md5sum] = "2d8018f8fa4c499e2c5b288d71660cba"
-SRC_URI[sha256sum] = "2987befc451f6404ea93bb99f00a38b80724fb655f121fed3bb0a08b65a771c8"
+SRC_URI[md5sum] = "3c5d32cec0f4c2dc45f4c2e84f4a20c5"
+SRC_URI[sha256sum] = "5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91"
 
 # Strip ${prefix} from ${docdir}, set result into docdir_stripped
 python () {

Signature · 1 line

1.7.2.5

Tom Rini

Acked-by on v1 5/5

2011-07-11 17:55 UTC #7 lore raw

Re: [PATCH 5/5] cmake: update to 2.8.5 release

Quoted 5 lines · Otavio Salvador

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/recipes-devtools/cmake/cmake-native_2.8.5.bb |   11 +++--------
 meta/recipes-devtools/cmake/cmake_2.8.5.bb        |   11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

Since this also fixed a little license problem (older versions shipped some unused Windows build fragments that were marked as proprietary) we've noticed:

Acked-by Tom Rini <[email protected]>

Signature · 2 lines

Tom Rini
Mentor Graphics Corporation

Richard Purdie

Applied

2011-07-12 13:44 UTC #8 lore raw

Re: [PATCH 5/5] cmake: update to 2.8.5 release

Quoted 7 lines · Tom Rini

Quoted 5 lines · Otavio Salvador

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/recipes-devtools/cmake/cmake-native_2.8.5.bb |   11 +++--------
 meta/recipes-devtools/cmake/cmake_2.8.5.bb        |   11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

Quoted 5 lines

Since this also fixed a little license problem (older versions shipped some unused Windows build fragments that were marked as proprietary) we've noticed:
Acked-by Tom Rini <[email protected]>

Merged to master, thanks.

Richard