Skip to contentSkip to conversation

Misc tidy-ups

PATCH Applied Paul Eggleton 2 participants 6 messages Feb 14, 2012 – Feb 21, 2012

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Misc tidy-ups

The following changes since commit e5ad03093dfc4364d1407183f458df79f347c7a1:

guile: fix cross configure failure (2012-02-10 13:38:16 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/fixes12
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes12

Paul Eggleton (4):
scripts/bitbake: pass through debug options to initial pseudo build conf/bitbake.conf: remove Opie definitions
classes/sdl: remove Opie-specific desktop file/packaging
stat: remove NATIVE_INSTALL_WORKS

 meta/classes/sdl.bbclass               |   38 --------------------------------
 meta/conf/bitbake.conf                 |   10 --------
 meta/recipes-extended/stat/stat_3.3.bb |    1 -
 scripts/bitbake                        |   14 +++++++++++-
 4 files changed, 13 insertions(+), 50 deletions(-)
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/4 scripts/bitbake: pass through debug options to initial pseudo build

If you specify -D or -v options to the bitbake wrapper script, and the initial pseudo build needs to be done, it's useful to pass these options through to that command so that you can debug the initial pseudo build as well.

Signed-off-by Paul Eggleton <[email protected]>
---
 scripts/bitbake |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
scripts/bitbake +13 -1
index 1c8d4eb..dda3b26 100755
@@ -4,6 +4,7 @@ export BBFETCH2=True
 export BB_ENV_EXTRAWHITE="PSEUDO_BUILD PSEUDO_DISABLED $BB_ENV_EXTRAWHITE"
 
 NO_BUILD_OPTS="--version -h --help -p --parse-only -s --show-versions -e --environment -g --graphviz"
+PASSTHROUGH_OPTS="-D -DD -DDD -DDDD -v"
 needpseudo="1"
 for opt in $@; do
 for key in $NO_BUILD_OPTS; do

@@ -69,7 +70,18 @@ if [ $buildpseudo = "1" ]; then
     if [ $needtar = "0" ]; then
         TARTARGET=""
     fi
-    bitbake pseudo-native $TARTARGET -c populate_sysroot
+    # Pass through debug options
+    additionalopts=""
+    for opt in $@; do
+        for key in $PASSTHROUGH_OPTS; do
+            if [ $opt = $key ]
+            then
+                additionalopts="$additionalopts $opt"
+                break
+            fi
+        done
+    done
+    bitbake pseudo-native $TARTARGET $additionalopts -c populate_sysroot
     ret=$?
     if [ "$ret" != "0" ]; then
         exit 1
Signature · 1 line
1.7.5.4
author
#2 lore raw

PATCH 2/4 conf/bitbake.conf: remove Opie definitions

In reply to Paul Eggleton

These values are now set via palmtop-defs.bbclass in meta-opie (and are not needed for anything else.)

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/conf/bitbake.conf |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
meta/conf/bitbake.conf +0 -10
index 2cc4b8f..90e5f7a 100644
@@ -520,16 +520,6 @@ BOOTSTRAP_EXTRA_RDEPENDS = ""
 BOOTSTRAP_EXTRA_RRECOMMENDS = ""
 
 ##################################################################
-# Palmtop stuff.
-##################################################################
-
-export QTDIR = "${STAGING_DIR_HOST}/qt2"
-export QPEDIR = "${STAGING_DIR_HOST}"
-export OPIEDIR = "${STAGING_DIR_HOST}"
-export palmtopdir = "${libdir}/opie"
-export palmqtdir = "${palmtopdir}"
-
-##################################################################
 # Download locations and utilities.
 ##################################################################
Signature · 1 line
1.7.5.4
author
#3 lore raw

PATCH 3/4 classes/sdl: remove Opie-specific desktop file/packaging

In reply to Paul Eggleton

This code will not work without palmtopdir being defined, and is better kept in meta-opie in any case (where we already have the OE-Classic version of this class).

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/classes/sdl.bbclass |   38 --------------------------------------
 1 files changed, 0 insertions(+), 38 deletions(-)
meta/classes/sdl.bbclass +0 -38
index a412ccb..cc31288 100644
@@ -3,42 +3,4 @@
 #
 
 DEPENDS += "virtual/libsdl libsdl-mixer libsdl-image"
-
-APPDESKTOP ?= "${PN}.desktop"
-APPNAME ?= "${PN}"
-APPIMAGE ?= "${PN}.png"
-
-sdl_do_sdl_install() {
-	install -d ${D}${palmtopdir}/bin
-	install -d ${D}${palmtopdir}/pics
-	install -d ${D}${palmtopdir}/apps/Games
-	ln -sf ${bindir}/${APPNAME} ${D}${palmtopdir}/bin/${APPNAME}
-	install -m 0644 ${APPIMAGE} ${D}${palmtopdir}/pics/${PN}.png
-
-	if [ -e "${APPDESKTOP}" ]
-	then
-		echo ${APPDESKTOP} present, installing to palmtopdir...
-		install -m 0644 ${APPDESKTOP} ${D}${palmtopdir}/apps/Games/${PN}.desktop
-	else
-		echo ${APPDESKTOP} not present, creating one on-the-fly...
-		cat >${D}${palmtopdir}/apps/Games/${PN}.desktop <<EOF
-[Desktop Entry]
-Note=Auto Generated... this may be not what you want
-Comment=${DESCRIPTION}
-Exec=${APPNAME}
-Icon=${PN}.png
-Type=Application
-Name=${PN}
-EOF
-	fi
-}
-
-EXPORT_FUNCTIONS do_sdl_install
-addtask sdl_install after do_compile before do_populate_sysroot
-
 SECTION = "x11/games"
-SECTION_${PN}-opie = "opie/games"
-
-PACKAGES += "${PN}-opie"
-RDEPENDS_${PN}-opie += "${PN}"
-FILES_${PN}-opie = "${palmtopdir}"
Signature · 1 line
1.7.5.4
author
#4 lore raw

PATCH 4/4 stat: remove NATIVE_INSTALL_WORKS

In reply to Paul Eggleton

This variable is no longer used in OE-Core.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/recipes-extended/stat/stat_3.3.bb |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
meta/recipes-extended/stat/stat_3.3.bb +0 -1
index 0c38742..b7666f0 100644
@@ -23,4 +23,3 @@ do_install() {
 #	install -m 755 stat ${D}${bindir}
 #}
 
-NATIVE_INSTALL_WORKS = "1"
Signature · 1 line
1.7.5.4
Applied
#5 lore raw
In reply to Paul Eggleton
Quoted 8 lines · Paul Eggleton

The following changes since commit e5ad03093dfc4364d1407183f458df79f347c7a1:

guile: fix cross configure failure (2012-02-10 13:38:16 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/fixes12
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes12

Quoted 5 lines

Paul Eggleton (4):
scripts/bitbake: pass through debug options to initial pseudo build conf/bitbake.conf: remove Opie definitions
classes/sdl: remove Opie-specific desktop file/packaging
stat: remove NATIVE_INSTALL_WORKS

Merged to master, thanks.

Richard