Skip to contentSkip to conversation

Small patchset being used at O.S. Systems and ready for pushing

PATCH Applied Otavio Salvador 6 participants 17 messages Apr 23, 2009 – Apr 24, 2009

lore
Share & tools
lore
#0 lore raw

Hello,

This patchset is being in use here at O.S. Systems and we're looking for pushing it back to OE mainline to avoid diverting for it.

All change are quite simple but I do want to get feedback from people before going forward and pushing it.

I belive that following patches might also go to stable:

[PATCH 1/6] qt4.inc: add translation packages to the dynamic list [PATCH 4/6] qt4-tools-native: add qdbusxml2cpp
[PATCH 6/6] acpid: add 1.0.8 (with netlink support)

The diffstat from the whole patchset is:

 classes/qmake2.bbclass                    |    1 +
 conf/checksums.ini                        |    8 +
 conf/machine/geodegx.conf                 |    2 +-
 conf/machine/geodelx.conf                 |   15 +-
 conf/machine/include/tune-geodegx.inc     |    3 +-
 conf/machine/include/tune-geodelx.inc     |    6 +-
 recipes/acpid/acpid/event.c.diff          |   43 +
 recipes/acpid/acpid/fixfd.diff            |   12 +
 recipes/acpid/acpid/netlink.diff          | 2797 +++++++++++++++++++++++++++++
 recipes/acpid/acpid_1.0.8.bb              |    6 +
 recipes/gtk-engines/gtk-engines_2.18.1.bb |   30 +
 recipes/qt4/files/linux.conf              |    1 +
 recipes/qt4/qt4-tools-native.inc          |    4 +-
 recipes/qt4/qt4-tools-native_4.4.3.bb     |    2 +-
 recipes/qt4/qt4-tools-native_4.5.0.bb     |    2 +-
 recipes/qt4/qt4.inc                       |    2 +-
 16 files changed, 2915 insertions(+), 19 deletions(-)

Thanks in advance,

--

Otavio Salvador                  O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br
#1 lore raw

PATCH 1/6 qt4.inc: add translation packages to the dynamic list

From: Otavio Salvador <[email protected]>

---
 recipes/qt4/qt4.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/qt4/qt4.inc +1 -1
index fb44e58..50ff013 100644
@@ -62,7 +62,7 @@ OTHER_PACKAGES = "\
              ${QT_BASE_NAME}-pixeltool"
 
 PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
-PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-*"
+PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-*"
 
 ALLOW_EMPTY_${PN} = "1"
 FILES_${PN}     = ""
Signature · 1 line
1.6.2.1.303.g63699
#2 lore raw

PATCH 2/6 gtk-engines: add 2.18.1

From: Otavio Salvador <[email protected]>

---
 conf/checksums.ini                        |    4 +++
 recipes/gtk-engines/gtk-engines_2.18.1.bb |   30 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 0 deletions(-)
 create mode 100644 recipes/gtk-engines/gtk-engines_2.18.1.bb
conf/checksums.ini +4 -0
index 69b45fe..27b7eb6 100644
@@ -9738,6 +9738,10 @@ sha256=15aa3a926307b4b3e40f3a9b05c604df6811eb48814b1534db32aed414aefb0c
 md5=060ea25c471e5f4cf5c1baeac27d0345
 sha256=0d8b6630c546327ddc67c700859731036eebdf77e51ad8b71e4d19d28ca2ff2c
 
+[http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.18/gtk-engines-2.18.1.tar.bz2]
+md5=5dc748cfb0587bb412adc49b666fb6f8
+sha256=d7e2672fcf80f5c35d481c24e0ab5b7d0f6526dcc3d8821ab76468c1816dc3bc
+
 [http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.2/gtk-engines-2.2.0.tar.bz2]
 md5=78e9276c28b509f3203de4873c20a263
 sha256=140541cae8b003d2f7210e2ef060ac328d7e45a04e2cf5fa943fff73c9955dd6
recipes/gtk-engines/gtk-engines_2.18.1.bb new file +30 -0
new file mode 100644
index 0000000..177c5b8
@@ -0,0 +1,30 @@
+LICENSE = "GPL"
+SECTION = "x11/base"
+DESCRIPTION = "GTK theme engines"
+DEPENDS = "gtk+ cairo"
+
+RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
+RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
+RDEPENDS_gtk-theme-mist = "gtk-engine-mist"
+RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine"
+RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue"
+RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice"
+RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial"
+RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks"
+
+inherit gnome  gtk-binver
+
+PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
+
+python populate_packages_prepend() {
+	import os.path
+
+	engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines']
+
+	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver))
+	themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
+
+	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
+	do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
+}
+
Signature · 1 line
1.6.2.1.303.g63699
#3 lore raw

PATCH 3/6 machine/geode[gl]x: use more optimization while compiling

From: Otavio Salvador <[email protected]>

---
 conf/machine/geodegx.conf             |    2 +-
 conf/machine/geodelx.conf             |   15 ++++++++-------
 conf/machine/include/tune-geodegx.inc |    3 +--
 conf/machine/include/tune-geodelx.inc |    6 +-----
 4 files changed, 11 insertions(+), 15 deletions(-)
conf/machine/geodegx.conf +1 -1
index 6fe6a83..e468a5d 100644
@@ -14,4 +14,4 @@ udevdir = "/dev"
 KERNEL_IMAGETYPE = "bzImage"
 
 GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
conf/machine/geodelx.conf +8 -7
index de4d9ca..80efb9c 100644
@@ -1,14 +1,15 @@
-TARGET_ARCH = "i486"
+# Machine file for devices with the AMD Geode LX processor 
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 
-require conf/machine/include/tune-geodelx.inc
+TARGET_ARCH =  "i486"
 
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+require conf/machine/include/tune-geodelx.inc
 
-PREFERRED_PROVIDER_virtual/kernel="linux-geodelx"
-
-SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-geodelx"
 
 KERNEL_IMAGETYPE = "bzImage"
 
 GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
+SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"
conf/machine/include/tune-geodegx.inc +1 -2
index cae285a..eda332a 100644
@@ -1,6 +1,5 @@
-TARGET_CC_ARCH = "-march=geode"
+TARGET_CC_ARCH = "-march=geode -mtune=geode"
 BASE_PACKAGE_ARCH = "geode"
 PACKAGE_EXTRA_ARCHS += "x86 i386 geode"
 
 FEED_ARCH = "geode"
-
conf/machine/include/tune-geodelx.inc +1 -5
index 63e6678..eda332a 100644
@@ -1,9 +1,5 @@
-# Geode CPU has it's own target in GCC 4.3
-# in older versions k6-2 is closest
-#
-TARGET_CC_ARCH = "-march=geode"
+TARGET_CC_ARCH = "-march=geode -mtune=geode"
 BASE_PACKAGE_ARCH = "geode"
 PACKAGE_EXTRA_ARCHS += "x86 i386 geode"
 
 FEED_ARCH = "geode"
-
Signature · 1 line
1.6.2.1.303.g63699
#4 lore raw

PATCH 4/6 qt4-tools-native: add qdbusxml2cpp

From: Otavio Salvador <[email protected]>

---
 recipes/qt4/qt4-tools-native.inc      |    4 +++-
 recipes/qt4/qt4-tools-native_4.4.3.bb |    2 +-
 recipes/qt4/qt4-tools-native_4.5.0.bb |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
recipes/qt4/qt4-tools-native.inc +3 -1
index df5afd3..ead27c1 100644
@@ -37,6 +37,7 @@ TOBUILD = "\
   src/tools/moc \
   src/corelib \
   src/sql \
+  src/dbus \
   src/qt3support \
   src/xml \
   src/tools/uic \
@@ -46,6 +47,7 @@ TOBUILD = "\
   src/tools/uic3 \
   tools/linguist/lrelease \
   tools/linguist/lupdate \
+  tools/qdbus \
 "
 
 do_compile() {
@@ -57,7 +59,7 @@ do_compile() {
 do_stage() {
 	install -d ${STAGING_BINDIR_NATIVE}/
     install -m 0755 bin/qmake ${STAGING_BINDIR_NATIVE}/qmake2
-    for i in moc uic uic3 rcc lrelease lupdate; do
+    for i in moc uic uic3 rcc lrelease lupdate qdbusxml2cpp; do
         install -m 0755 bin/${i} ${STAGING_BINDIR_NATIVE}/${i}4
     done
     
recipes/qt4/qt4-tools-native_4.4.3.bb +1 -1
index ef86db4..e8fc316 100644
@@ -1,2 +1,2 @@
 require qt4-tools-native.inc
-PR = "r3"
+PR = "r4"
recipes/qt4/qt4-tools-native_4.5.0.bb +1 -1
index ab63314..158a4dd 100644
@@ -1,5 +1,5 @@
 require qt4-tools-native.inc
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 TOBUILD := "src/tools/bootstrap ${TOBUILD}"
Signature · 1 line
1.6.2.1.303.g63699
#5 lore raw

PATCH 5/6 qmake2.bbclass: add OE_QMAKE_QDBUSXML2CPP var

From: Otavio Salvador <[email protected]>

---
 classes/qmake2.bbclass       |    1 +
 recipes/qt4/files/linux.conf |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
classes/qmake2.bbclass +1 -0
index f0a7931..cbc71d1 100644
@@ -10,6 +10,7 @@ export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
 export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
 export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
 export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
+export OE_QMAKE_QDBUSXML2CPP = "${STAGING_BINDIR_NATIVE}/qdbusxml2cpp4"
 export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
 export OE_QMAKE_LINK = "${CXX}"
 export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
recipes/qt4/files/linux.conf +1 -0
index 3471c6f..b96de12 100644
@@ -28,6 +28,7 @@ QMAKE_MOC             = $(OE_QMAKE_MOC)
 QMAKE_UIC             = $(OE_QMAKE_UIC)
 QMAKE_UIC3            = $(OE_QMAKE_UIC3)
 QMAKE_RCC             = $(OE_QMAKE_RCC)
+QMAKE_QDBUSXML2CPP    = $(OE_QMAKE_QDBUSXML2CPP)
 
 QMAKE_AR              = $(OE_QMAKE_AR) cqs
 QMAKE_OBJCOPY         = objcopy
Signature · 1 line
1.6.2.1.303.g63699
#6 lore raw

PATCH 6/6 acpid: add 1.0.8 (with netlink support)

From: Otavio Salvador <[email protected]>

---
 conf/checksums.ini               |    4 +
 recipes/acpid/acpid/event.c.diff |   43 +
 recipes/acpid/acpid/fixfd.diff   |   12 +
 recipes/acpid/acpid/netlink.diff | 2797 ++++++++++++++++++++++++++++++++++++++
 recipes/acpid/acpid_1.0.8.bb     |    6 +
 5 files changed, 2862 insertions(+), 0 deletions(-)
 create mode 100644 recipes/acpid/acpid/event.c.diff
 create mode 100644 recipes/acpid/acpid/fixfd.diff
 create mode 100644 recipes/acpid/acpid/netlink.diff
 create mode 100644 recipes/acpid/acpid_1.0.8.bb
conf/checksums.ini +4 -0
index 27b7eb6..36d2b56 100644
@@ -1298,6 +1298,10 @@ sha256=aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160
 md5=5c9b705700df51d232be223b6ab6414d
 sha256=aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160
 
+[http://downloads.sourceforge.net/acpid/acpid-1.0.8.tar.gz]
+md5=1d9c52fe2c0b51f8463f357c2a3d3ddb
+sha256=d57ae5302c38c37d060a097fa51600fe06fbfffd575641d638407944f126b7b1
+
 [http://ftp.gnu.org/gnu/classpathx/activation-1.1.1.tar.gz]
 md5=de50d7728e8140eb404f2b4554321f8c
 sha256=b1b5ef560d30fcb11fbf537246857d14110ce4eb2b200d4c54690472305d87b7
recipes/acpid/acpid/event.c.diff new file +43 -0

43 lines not on this page · raw message

recipes/acpid/acpid/fixfd.diff new file +12 -0
new file mode 100644
index 0000000..93ceb5c
@@ -0,0 +1,12 @@
+diff -Nru a/acpid.c b/acpid.c
+--- a/acpid.c	2008-11-03 14:04:43.000000000 +0100
++++ b/acpid.c	2008-12-19 18:38:14.291127677 +0100
+@@ -456,7 +456,7 @@
+ 	int log_opts;
+ 
+ 	/* open /dev/null */
+-	nullfd = open("/dev/null", O_RDONLY);
++	nullfd = open("/dev/null", O_RDWR);
+ 	if (nullfd < 0) {
+ 		fprintf(stderr, "%s: can't open %s: %s\n", progname, 
+ 			"/dev/null", strerror(errno));
recipes/acpid/acpid/netlink.diff new file +2797 -0

2,797 lines not on this page · raw message

recipes/acpid/acpid_1.0.8.bb new file +6 -0
new file mode 100644
index 0000000..98638e6
@@ -0,0 +1,6 @@
+require acpid.inc
+
+SRC_URI_append = " file://event.c.diff;patch=1 \
+                   file://fixfd.diff;patch=1 \
+                   file://netlink.diff;patch=1"
+
Signature · 1 line
1.6.2.1.303.g63699
#9 lore raw

Re: [PATCH 3/6] machine/geode[gl]x: use more optimization while compiling

In reply to Otavio Salvador

conf/machine/geodelx.conf line 15

Quoted 3 lines · Otavio Salvador
conf/machine/geodelx.conf +2 -1
-GLIBC_EXTRA_OECONF = "--with-tls"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
+SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"

shouldn't that be _pn-glibc?

And shouldn't you make glibc geode specific after that?

regards,

Koen

#10 lore raw

Re: [PATCH 3/6] machine/geode[gl]x: use more optimization while compiling

Quoted 7 lines · Koen Kooi

conf/machine/geodelx.conf line 15

Quoted 3 lines · Otavio Salvador
conf/machine/geodelx.conf +2 -1
-GLIBC_EXTRA_OECONF = "--with-tls"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
+SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"

shouldn't that be _pn-glibc?

You mean the SELECT_OPTIMIZATION?

Quoted 1 line

And shouldn't you make glibc geode specific after that?

Sorry, didn't get what you mean.

Signature · 3 lines
Otavio Salvador                  O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br
#11 lore raw

Re: [PATCH 3/6] machine/geode[gl]x: use more optimization while compiling

Quoted 11 lines · Otavio Salvador
Quoted 7 lines · Koen Kooi

conf/machine/geodelx.conf line 15

Quoted 3 lines · Otavio Salvador
conf/machine/geodelx.conf +2 -1
-GLIBC_EXTRA_OECONF = "--with-tls"
+GLIBC_EXTRA_OECONF = "--with-tls --with-cpu=geode"
+SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"

shouldn't that be _pn-glibc?

You mean the SELECT_OPTIMIZATION?

yes ${PN} is only in local overrides (scope: current recipe), pn-${PN} is in global overrides.

Quoted 3 lines
Quoted 1 line

And shouldn't you make glibc geode specific after that?

Sorry, didn't get what you mean.

You're changing the way glibc is built for a specific machine, so the resulting glibc package should technically machine specific. But it seems it's compatible with other builds, so there isn't a big impact. This does mean that you'll loose the optimization if you build another i586 arch first.

regards,

Koen

#12 lore raw

Re: [PATCH 3/6] machine/geode[gl]x: use more optimization while compiling

Quoted 9 lines · Koen Kooi
Quoted 5 lines · Otavio Salvador
Quoted 2 lines · Koen Kooi

On 23-04-09 03:17, Otavio Salvador wrote:
shouldn't that be _pn-glibc?

You mean the SELECT_OPTIMIZATION?

yes ${PN} is only in local overrides (scope: current recipe), pn-${PN} is in global overrides.

Ok, point taken.

Quoted 9 lines
Quoted 3 lines
Quoted 1 line

And shouldn't you make glibc geode specific after that?

Sorry, didn't get what you mean.

You're changing the way glibc is built for a specific machine, so the resulting glibc package should technically machine specific. But it seems it's compatible with other builds, so there isn't a big impact. This does mean that you'll loose the optimization if you build another i586 arch first.

Not in this specific case since it uses a different base arch; it builds all ipk on geode-*.

Signature · 3 lines
Otavio Salvador                  O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br
#13 lore raw

Re: [PATCH 3/6] machine/geode[gl]x: use more optimization while compiling

In reply to Otavio Salvador

Dnia czwartek, 23 kwietnia 2009 o 03:17:38 Otavio Salvador napisał(a):

Quoted 9 lines

From: Otavio Salvador <[email protected]>

---
 conf/machine/geodegx.conf             |    2 +-
 conf/machine/geodelx.conf             |   15 ++++++++-------
 conf/machine/include/tune-geodegx.inc |    3 +--
 conf/machine/include/tune-geodelx.inc |    6 +-----
 4 files changed, 11 insertions(+), 15 deletions(-)

Looks like after those changes both tune files are same. What about creating tune-geode.inc which will be used instead of both?

And if you use any of those two machines consider moving them to linux recipe as GeodeLX is working nicely with recent kernels (I have Debian on alix 1c (geodelx 800) with 2.6.29-debian kernel).

Regards,

Signature · 3 lines
JID:      [email protected]
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
#14 lore raw

Re: [PATCH 3/6] machine/geode[gl]x: use more optimization while compiling

Quoted 11 lines · Marcin Juszkiewicz

Dnia czwartek, 23 kwietnia 2009 o 03:17:38 Otavio Salvador napisał(a):

Quoted 9 lines

From: Otavio Salvador <[email protected]>

---
 conf/machine/geodegx.conf             |    2 +-
 conf/machine/geodelx.conf             |   15 ++++++++-------
 conf/machine/include/tune-geodegx.inc |    3 +--
 conf/machine/include/tune-geodelx.inc |    6 +-----
 4 files changed, 11 insertions(+), 15 deletions(-)
Quoted 2 lines

Looks like after those changes both tune files are same. What about creating tune-geode.inc which will be used instead of both?

I plan to do that in next step.

Quoted 3 lines

And if you use any of those two machines consider moving them to linux recipe as GeodeLX is working nicely with recent kernels (I have Debian on alix 1c (geodelx 800) with 2.6.29-debian kernel).

Yes, I use it but with a customized kernel. I can move it to linux recipe for sure.

Signature · 3 lines
Otavio Salvador                  O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br