[PATCH 0/12] random misc trivia

[PATCH 0/12] random misc trivia

[Bernhard Reutner-Fischer]

Hi,

A small series of unrelated patches that i could easily isolate.
Please apply.

thanks,
Bernhard

[PATCH 01/12] trim superfluous trailing whitespace

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 recipes/busybox/busybox.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index 519fcd6..7f67f47 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -55,7 +55,7 @@ FILES_${PN} += "${datadir}/udhcpc"
 INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd"
 INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd"
 INITSCRIPT_NAME_${PN}-syslog = "syslog"
-INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 
+INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
 CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf"
 
 # This disables the syslog startup links in slugos (see slugos-init)
@@ -137,7 +137,7 @@ pkg_postinst_${PN} () {
 	# (update-alternatives have no problem replacing links later anyway)
 	test -n 2> /dev/null || alias test='busybox test'
 	if test "x$D" = "x"; then while read link; do if test ! -h "$link"; then case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; /*) to="/bin/busybox";; esac; busybox ln -s $to $link; fi; done </etc/busybox.links; fi
-	
+
 	# This adds the links, remember that this has to work when building an image too, hence the $D
 	while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; /*) to="/bin/busybox";; esac; bn=`basename $link`; update-alternatives --install $link $bn $to 50; done <$D/etc/busybox.links
 }
@@ -167,7 +167,7 @@ pkg_prerm_${PN} () {
 			/*/*/*) to="../../bin/busybox";;
 			/bin/*) to="busybox";;
 			/*/*) to="../bin/busybox";;
-			/*) to="/bin/busybox";;		
+			/*) to="/bin/busybox";;
 		esac
 		bn=`basename $link`
 		sh /usr/bin/update-alternatives --remove $bn $to
-- 
1.6.5

[PATCH 02/12] some more !getopt_long fixes

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 recipes/busybox/files/hwclock.sh |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/recipes/busybox/files/hwclock.sh b/recipes/busybox/files/hwclock.sh
index 6c0af34..57c9fc7 100644
--- a/recipes/busybox/files/hwclock.sh
+++ b/recipes/busybox/files/hwclock.sh
@@ -14,27 +14,27 @@
 
 . /etc/default/rcS
 
-[ "$UTC" = yes ] && UTC=--utc || UTC=--localtime
+[ "$UTC" = "yes" ] && UTC=-u || UTC=-l
 
 case "$1" in
         start)
-                if [ "$VERBOSE" != no ]
+                if [ "$VERBOSE" != "no" ]
                 then
                         echo "System time was `date`."
                         echo "Setting the System Clock using the Hardware Clock as reference..."
                 fi
 
-		if [ "$HWCLOCKACCESS" != no ]
+		if [ "$HWCLOCKACCESS" != "no" ]
 		then
 			if [ -z "$TZ" ]
 			then
-	                   hwclock -s $UTC;# --hctosys
+	                   hwclock -s $UTC
 			else
-			   TZ="$TZ" hwclock -s $UTC;# --hctosys
+			   TZ="$TZ" hwclock -s $UTC
 			fi
 		fi
 
-                if [ "$VERBOSE" != no ]
+                if [ "$VERBOSE" != "no" ]
                 then
                         echo "System Clock set. System local time is now `date`."
                 fi
@@ -47,24 +47,24 @@ case "$1" in
 		# WARNING: If you disable this, any changes to the system
 		#          clock will not be carried across reboots.
 		#
-		if [ "$VERBOSE" != no ]
+		if [ "$VERBOSE" != "no" ]
 		then
 			echo "Saving the System Clock time to the Hardware Clock..."
 		fi
-		if [ "$HWCLOCKACCESS" != no ]
+		if [ "$HWCLOCKACCESS" != "no" ]
 		then
-			hwclock -w $UTC;# --systohc
+			hwclock -w $UTC
 		fi
-		if [ "$VERBOSE" != no ]
+		if [ "$VERBOSE" != "no" ]
 		then
 			echo "Hardware Clock updated to `date`."
 		fi
                 exit 0
                 ;;
 	show)
-		if [ "$HWCLOCKACCESS" != no ]
+		if [ "$HWCLOCKACCESS" != "no" ]
 		then
-			hwclock -r $UTC;# --show
+			hwclock -r $UTC
 		fi
 		;;
         *)
-- 
1.6.5

[PATCH 03/12] osso-application-installer: nonworking

[Bernhard Reutner-Fischer]

osso-application-installer depends on nonworking hildon-lgpl

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 .../fix-buildsystem.patch                          |   65 --------------------
 .../maemo/osso-application-installer_1.0.03-1.bb   |   19 ------
 .../fix-buildsystem.patch                          |   65 ++++++++++++++++++++
 .../osso-application-installer_1.0.03-1.bb         |   19 ++++++
 4 files changed, 84 insertions(+), 84 deletions(-)
 delete mode 100644 recipes/maemo/osso-application-installer/fix-buildsystem.patch
 delete mode 100644 recipes/maemo/osso-application-installer_1.0.03-1.bb
 create mode 100644 recipes/nonworking/osso-application-installer/fix-buildsystem.patch
 create mode 100644 recipes/nonworking/osso-application-installer/osso-application-installer_1.0.03-1.bb

diff --git a/recipes/maemo/osso-application-installer/fix-buildsystem.patch b/recipes/maemo/osso-application-installer/fix-buildsystem.patch
deleted file mode 100644
index d89522b..0000000
--- a/recipes/maemo/osso-application-installer/fix-buildsystem.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -urbB osso-application-installer-1.0.03_old/configure.ac osso-application-installer-1.0.03/configure.ac
---- osso-application-installer-1.0.03_old/configure.ac	2005-05-22 22:06:52.000000000 +0200
-+++ osso-application-installer-1.0.03/configure.ac	2005-06-30 12:19:24.000000000 +0200
-@@ -38,9 +38,9 @@
- AC_SUBST(CP_CFLAGS)
- AC_SUBST(CP_LIBS)
- 
--cp_pluginlibdir=`pkg-config hildon-control-panel --variable=pluginlibdir`
-+cp_pluginlibdir=${libdir}/hildon-control-panel
- AC_SUBST(cp_pluginlibdir)
--cp_plugindesktopdir=`pkg-config hildon-control-panel --variable=plugindesktopentrydir`
-+cp_plugindesktopdir=${datadir}/applications/hildon-control-panel
- AC_SUBST(cp_plugindesktopdir)
- 
- # Localisation-related
-@@ -52,12 +52,12 @@
- AM_GLIB_GNU_GETTEXT
- 
- # Mime crap
--dnl MIME-type registration check (2.6 / 2.8 version)
--AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
--AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno)
-+#dnl MIME-type registration check (2.6 / 2.8 version)
-+#AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
-+#AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno)
- 
--AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
--AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno)
-+#AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
-+#AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno)
- 
- 
- applicationinstallerlocaledir=${datadir}/locale
-@@ -76,7 +76,7 @@
- AC_SUBST(hildonpixmapdir)
- AC_SUBST(hildonstatusbarlibdir)
- 
--dbuslibpathdir=`$PKG_CONFIG --variable=libdir dbus-1`
-+dbuslibpathdir=${libdir}
- dbusconfdir=/etc/dbus-1/system.d
- dbusservdir=${dbuslibpathdir}/dbus-1.0/services
- AC_SUBST(dbuslibpathdir)
-diff -urbB osso-application-installer-1.0.03_old/mime/Makefile.am osso-application-installer-1.0.03/mime/Makefile.am
---- osso-application-installer-1.0.03_old/mime/Makefile.am	2005-05-22 22:06:52.000000000 +0200
-+++ osso-application-installer-1.0.03/mime/Makefile.am	2005-06-30 12:19:24.000000000 +0200
-@@ -2,19 +2,3 @@
- mime_DATA = osso-application-installer.xml
- 
- EXTRA_DIST = $(mime_DATA)
--
--install-data-hook:
--if HAVE_26_MIME
--	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
--endif
--if HAVE_28_MIME
--	$(UPDATE_DESKTOP_DATABASE)
--endif
--
--uninstall-hook:
--if HAVE_26_MIME
--	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
--endif
--if HAVE_28_MIME
--	$(UPDATE_DESKTOP_DATABASE) 
--endif
diff --git a/recipes/maemo/osso-application-installer_1.0.03-1.bb b/recipes/maemo/osso-application-installer_1.0.03-1.bb
deleted file mode 100644
index 7380255..0000000
--- a/recipes/maemo/osso-application-installer_1.0.03-1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-PR         = "r0"
-LICENSE    = "GPL"
-
-DEPENDS = "hildon-lgpl hildon-base-lib libosso hildon-libs hildon-control-panel shared-mime-info"
-RDEPENDS = "shared-mime-info"
-
-SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz \
-           file://fix-buildsystem.patch;patch=1"
-
-S = "${WORKDIR}/osso-application-installer-1.0.03"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += "${libdir}/dbus-1.0 ${libdir}/hildon-control-panel/*.so ${datadir}/applications ${datadir}/mime"
-
-pkg_postinst () {
-  echo "Updating MIME database... this may take a while."
-  ${bindir}/update-mime-database ${datadir}/mime
-}
diff --git a/recipes/nonworking/osso-application-installer/fix-buildsystem.patch b/recipes/nonworking/osso-application-installer/fix-buildsystem.patch
new file mode 100644
index 0000000..d89522b
--- /dev/null
+++ b/recipes/nonworking/osso-application-installer/fix-buildsystem.patch
@@ -0,0 +1,65 @@
+diff -urbB osso-application-installer-1.0.03_old/configure.ac osso-application-installer-1.0.03/configure.ac
+--- osso-application-installer-1.0.03_old/configure.ac	2005-05-22 22:06:52.000000000 +0200
++++ osso-application-installer-1.0.03/configure.ac	2005-06-30 12:19:24.000000000 +0200
+@@ -38,9 +38,9 @@
+ AC_SUBST(CP_CFLAGS)
+ AC_SUBST(CP_LIBS)
+ 
+-cp_pluginlibdir=`pkg-config hildon-control-panel --variable=pluginlibdir`
++cp_pluginlibdir=${libdir}/hildon-control-panel
+ AC_SUBST(cp_pluginlibdir)
+-cp_plugindesktopdir=`pkg-config hildon-control-panel --variable=plugindesktopentrydir`
++cp_plugindesktopdir=${datadir}/applications/hildon-control-panel
+ AC_SUBST(cp_plugindesktopdir)
+ 
+ # Localisation-related
+@@ -52,12 +52,12 @@
+ AM_GLIB_GNU_GETTEXT
+ 
+ # Mime crap
+-dnl MIME-type registration check (2.6 / 2.8 version)
+-AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
+-AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno)
++#dnl MIME-type registration check (2.6 / 2.8 version)
++#AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
++#AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno)
+ 
+-AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
+-AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno)
++#AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
++#AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno)
+ 
+ 
+ applicationinstallerlocaledir=${datadir}/locale
+@@ -76,7 +76,7 @@
+ AC_SUBST(hildonpixmapdir)
+ AC_SUBST(hildonstatusbarlibdir)
+ 
+-dbuslibpathdir=`$PKG_CONFIG --variable=libdir dbus-1`
++dbuslibpathdir=${libdir}
+ dbusconfdir=/etc/dbus-1/system.d
+ dbusservdir=${dbuslibpathdir}/dbus-1.0/services
+ AC_SUBST(dbuslibpathdir)
+diff -urbB osso-application-installer-1.0.03_old/mime/Makefile.am osso-application-installer-1.0.03/mime/Makefile.am
+--- osso-application-installer-1.0.03_old/mime/Makefile.am	2005-05-22 22:06:52.000000000 +0200
++++ osso-application-installer-1.0.03/mime/Makefile.am	2005-06-30 12:19:24.000000000 +0200
+@@ -2,19 +2,3 @@
+ mime_DATA = osso-application-installer.xml
+ 
+ EXTRA_DIST = $(mime_DATA)
+-
+-install-data-hook:
+-if HAVE_26_MIME
+-	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+-endif
+-if HAVE_28_MIME
+-	$(UPDATE_DESKTOP_DATABASE)
+-endif
+-
+-uninstall-hook:
+-if HAVE_26_MIME
+-	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+-endif
+-if HAVE_28_MIME
+-	$(UPDATE_DESKTOP_DATABASE) 
+-endif
diff --git a/recipes/nonworking/osso-application-installer/osso-application-installer_1.0.03-1.bb b/recipes/nonworking/osso-application-installer/osso-application-installer_1.0.03-1.bb
new file mode 100644
index 0000000..7380255
--- /dev/null
+++ b/recipes/nonworking/osso-application-installer/osso-application-installer_1.0.03-1.bb
@@ -0,0 +1,19 @@
+PR         = "r0"
+LICENSE    = "GPL"
+
+DEPENDS = "hildon-lgpl hildon-base-lib libosso hildon-libs hildon-control-panel shared-mime-info"
+RDEPENDS = "shared-mime-info"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz \
+           file://fix-buildsystem.patch;patch=1"
+
+S = "${WORKDIR}/osso-application-installer-1.0.03"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${libdir}/dbus-1.0 ${libdir}/hildon-control-panel/*.so ${datadir}/applications ${datadir}/mime"
+
+pkg_postinst () {
+  echo "Updating MIME database... this may take a while."
+  ${bindir}/update-mime-database ${datadir}/mime
+}
-- 
1.6.5

[PATCH 04/12] matchbox-panel-2: fix DEPENDS

[Bernhard Reutner-Fischer]

libacpi has no recipe as opposed to acpid

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 recipes/matchbox2/matchbox-panel-2_svn.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes/matchbox2/matchbox-panel-2_svn.bb b/recipes/matchbox2/matchbox-panel-2_svn.bb
index ae3b122..1a61370 100644
--- a/recipes/matchbox2/matchbox-panel-2_svn.bb
+++ b/recipes/matchbox2/matchbox-panel-2_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "matchbox-panel-2 is a lightweight dock (system tray) application
 LICENSE = "GPLv2"
 SECTION = "x11/panels"
 DEPENDS = "gtk+ startup-notification dbus dbus-glib matchbox-panel-2-icon-themes"
-DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
+DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "acpid", "",d)}"
 DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
 RDEPENDS_${PN} = "matchbox-panel-2-icon-theme"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-- 
1.6.5

[PATCH 05/12] no need to set LD nowadays

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 recipes/busybox/busybox.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index 7f67f47..c80b3bd 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -66,7 +66,7 @@ RDEPENDS_${PN}-syslog += "${PN}"
 RDEPENDS_${PN}-udhcpd += "${PN}"
 
 # Use gcc for linking so LDFLAGS actually makes sense
-LD = "${CC} -nostdlib"
+#LD = "${CC} -nostdlib"
 
 inherit cml1 update-rc.d
 
@@ -78,6 +78,7 @@ do_configure () {
 
 do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS
+	export EXTRA_CFLAGS="$CFLAGS"
 	base_do_compile
 }
 
-- 
1.6.5

[PATCH 06/12] quilt: use builtin date routines

[Bernhard Reutner-Fischer]

quilt tries to use an RFC822 date format which is obsoleted
by rfc2822 since 8 years now.
It has a builtin date handler, so use that and not the date
binary (which may only support rfc2822 by now, as busybox does)

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 recipes/quilt/quilt-native.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes/quilt/quilt-native.inc b/recipes/quilt/quilt-native.inc
index f815969..cad1b74 100644
--- a/recipes/quilt/quilt-native.inc
+++ b/recipes/quilt/quilt-native.inc
@@ -9,7 +9,7 @@ INHIBIT_AUTOTOOLS_DEPS = "1"
 inherit autotools native
 
 PATCHTOOL = "patch"
-EXTRA_OECONF = "--disable-nls"
+EXTRA_OECONF = "--disable-nls --without-date"
 
 do_configure () {
 	oe_runconf
-- 
1.6.5

[PATCH 07/12] Document proxy setup in local.conf.sample

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 conf/local.conf.sample |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 643ae0b..e7c4559 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -30,6 +30,9 @@ BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
 # This is a regulary expression, so be sure to get your parenthesis balanced.
 BBMASK = ""
 
+# Proxy settings:
+# BB_ENV_EXTRAWHITE="http_proxy ftp_proxy no_proxy"
+
 # Uncomment this if you want to use a prebuilt toolchain. You will need to
 # provide packages for toolchain and additional libraries yourself. You also
 # have to set PATH in your environment to make sure BitBake finds additional binaries.
-- 
1.6.5

[PATCH 08/12] commentary typo fix

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 recipes/uclibc/uclibc_git.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb
index 5f44466..757a538 100644
--- a/recipes/uclibc/uclibc_git.bb
+++ b/recipes/uclibc/uclibc_git.bb
@@ -1,4 +1,4 @@
-# UCLIBC_BASE should be the latest released revision of uclibc (that way
+# UCLIBC_BASE should be the latest released version of uclibc (that way
 # the config files will typically be correct!)  uclibc-svn takes precedence
 # over uclibc-${UCLIBC_BASE}, if a config file in uclibc-snv is out of date
 # try removing it
-- 
1.6.5

[PATCH 09/12] flex: remove version specifics from generic inc

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 recipes/flex/flex-native_2.5.31.bb |    4 ++--
 recipes/flex/flex.inc              |    3 ---
 recipes/flex/flex_2.5.31.bb        |    5 ++++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes/flex/flex-native_2.5.31.bb b/recipes/flex/flex-native_2.5.31.bb
index 1e9354a..de3f215 100644
--- a/recipes/flex/flex-native_2.5.31.bb
+++ b/recipes/flex/flex-native_2.5.31.bb
@@ -1,6 +1,6 @@
-require flex.inc
+require flex_${PV}.bb
 inherit native
-PR = "r2"
+PR = "r3"
 
 do_stage () {
 	install -m 0755 flex ${STAGING_BINDIR}
diff --git a/recipes/flex/flex.inc b/recipes/flex/flex.inc
index 4ebd44a..37e34fe 100644
--- a/recipes/flex/flex.inc
+++ b/recipes/flex/flex.inc
@@ -2,9 +2,6 @@ DESCRIPTION = "Flex is a tool for generating programs that recognize lexical pat
 SECTION = "devel"
 LICENSE = "BSD"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-2.5.31.tar.bz2 \
-           file://flex-lvalue.diff;patch=1 \
-           file://fix-gen.patch;patch=1"
 S = "${WORKDIR}/flex-${PV}"
 
 inherit autotools
diff --git a/recipes/flex/flex_2.5.31.bb b/recipes/flex/flex_2.5.31.bb
index e247a03..ae9e6f9 100644
--- a/recipes/flex/flex_2.5.31.bb
+++ b/recipes/flex/flex_2.5.31.bb
@@ -1,7 +1,10 @@
 require flex.inc
 PR = "r5"
 
-SRC_URI += "file://include.patch;patch=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2 \
+           file://flex-lvalue.diff;patch=1 \
+           file://fix-gen.patch;patch=1 \
+           file://include.patch;patch=1"
 
 do_stage() {
 	oe_libinstall -a libfl ${STAGING_LIBDIR}
-- 
1.6.5

[PATCH 10/12] git: remove version specifics from generic inc

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 recipes/git/git-native_1.6.0.4.bb |    1 +
 recipes/git/git.inc               |    5 ++---
 recipes/git/git_1.6.0.4.bb        |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes/git/git-native_1.6.0.4.bb b/recipes/git/git-native_1.6.0.4.bb
index 71b111b..c17ce6e 100644
--- a/recipes/git/git-native_1.6.0.4.bb
+++ b/recipes/git/git-native_1.6.0.4.bb
@@ -2,3 +2,4 @@ require git.inc
 inherit native
 DEPENDS = "openssl-native curl-native zlib-native expat-native"
 PR = "r4"
+SRC_URI += "file://autotools.patch;patch=1"
diff --git a/recipes/git/git.inc b/recipes/git/git.inc
index fb88fd4..644e159 100644
--- a/recipes/git/git.inc
+++ b/recipes/git/git.inc
@@ -2,9 +2,8 @@ DESCRIPTION = "The git revision control system used by the Linux kernel develope
 SECTION = "console/utils"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \
-           file://autotools.patch;patch=1 \
-	   "
+SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2"
+
 S = "${WORKDIR}/git-${PV}"
 
 inherit autotools
diff --git a/recipes/git/git_1.6.0.4.bb b/recipes/git/git_1.6.0.4.bb
index e839ab9..c37e3d0 100644
--- a/recipes/git/git_1.6.0.4.bb
+++ b/recipes/git/git_1.6.0.4.bb
@@ -1,6 +1,7 @@
 require git.inc
 
-SRC_URI += "file://snprintf-returns-bogus.patch;patch=1"
+SRC_URI += "file://autotools.patch;patch=1 \
+            file://snprintf-returns-bogus.patch;patch=1"
 
 DEPENDS = "openssl curl zlib expat"
 RDEPENDS = "perl perl-module-file-path cpio findutils sed"
-- 
1.6.5

[PATCH 11/12] fix binutils patch to apply to 2.20

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 .../binutils-x86_64_i386_biarch.patch              |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes/binutils/binutils-2.20/binutils-x86_64_i386_biarch.patch b/recipes/binutils/binutils-2.20/binutils-x86_64_i386_biarch.patch
index 6054434..4cd9e22 100644
--- a/recipes/binutils/binutils-2.20/binutils-x86_64_i386_biarch.patch
+++ b/recipes/binutils/binutils-2.20/binutils-x86_64_i386_biarch.patch
@@ -11,9 +11,9 @@
 --- binutils/ld/emulparams/elf_i386.sh
 +++ binutils/ld/emulparams/elf_i386.sh
 @@ -12,3 +12,13 @@
- NO_SMALL_DATA=yes
  SEPARATE_GOTPLT=12
  SHARABLE_SECTIONS=yes
+ IREL_IN_PLT=
 +
 +# Linux modify the default library search path to first include
 +# a 32-bit specific directory.
-- 
1.6.5

[PATCH 12/12] task-base.bb: use uniform test for set

[Bernhard Reutner-Fischer]

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 recipes/tasks/task-base.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb
index d59acba..fc04b46 100644
--- a/recipes/tasks/task-base.bb
+++ b/recipes/tasks/task-base.bb
@@ -136,7 +136,9 @@ python __anonymous () {
 
     import bb
 
-    if not hasattr(__builtins__, 'set'):
+    try:
+	set
+    except NameError:
 	from sets import Set as set
 
     distro_features = set(bb.data.getVar("DISTRO_FEATURES", d, 1).split())
-- 
1.6.5

Re: [PATCH 05/12] no need to set LD nowadays

[Phil Blundell]

On Mon, 2010-02-08 at 22:14 +0100, Bernhard Reutner-Fischer wrote:
>  # Use gcc for linking so LDFLAGS actually makes sense
> -LD = "${CC} -nostdlib"
> +#LD = "${CC} -nostdlib"
>  

Thanks for the patch.  When you say "nowadays", do you know which actual
versions of busybox this is true for?  Is this definitely correct for
all the versions that we have in the .dev tree?

Also, if that line is genuinely no longer required, you might as well
just delete it.  There is no point in leaving commented-out cruft in
these recipes indefinitely.

p.

Re: [PATCH 05/12] no need to set LD nowadays

[Koen Kooi]

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

On 08-02-10 22:14, Bernhard Reutner-Fischer wrote:
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> ---
>  recipes/busybox/busybox.inc |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
> index 7f67f47..c80b3bd 100644
> --- a/recipes/busybox/busybox.inc
> +++ b/recipes/busybox/busybox.inc
> @@ -66,7 +66,7 @@ RDEPENDS_${PN}-syslog += "${PN}"
>  RDEPENDS_${PN}-udhcpd += "${PN}"
>  
>  # Use gcc for linking so LDFLAGS actually makes sense
> -LD = "${CC} -nostdlib"
> +#LD = "${CC} -nostdlib"

We have an scm, so you can just delete both the statement and comment.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLcRh2MkyGM64RGpERApVjAJ0X74dRU/v8yAyQvqhcqrCz9v1LwgCfZ52X
tRQfra5kwqse4cUBbK04+60=
=q9ca
-----END PGP SIGNATURE-----

Re: [PATCH 05/12] no need to set LD nowadays

[Bernhard Reutner-Fischer]

On Mon, Feb 08, 2010 at 09:56:26PM +0000, Phil Blundell wrote:
>On Mon, 2010-02-08 at 22:14 +0100, Bernhard Reutner-Fischer wrote:
>>  # Use gcc for linking so LDFLAGS actually makes sense
>> -LD = "${CC} -nostdlib"
>> +#LD = "${CC} -nostdlib"
>>  
>
>Thanks for the patch.  When you say "nowadays", do you know which actual
>versions of busybox this is true for?  Is this definitely correct for

busybox >= 1.4.0 switched to kbuild, i.e.
make CROSS_COMPILE=alpha-linux- EXTRA_CFLAGS=-fwhatever \
EXTRA_LDFLAGS=-Wl,--warn-multiple-gp

For the usual case you'd either set CONFIG_CROSS_COMPILER_PREFIX in the
.config or pass CC down to make.

If you happen to have an odd host compiler then you want those too:
HOSTCC=ccc HOSTCFLAGS="-ieee" make ....

>all the versions that we have in the .dev tree?

It seems that the .dev tree has 1.2.1, 1.2.2, 1.3.1 still in there but
i, personally would strongly advise against using those (same for the
standalone tinylogin, but that's a different thing and not relevant
right now).
>
>Also, if that line is genuinely no longer required, you might as well
>just delete it.  There is no point in leaving commented-out cruft in
>these recipes indefinitely.

The ancient cruft versions made me leave in that comment.

Re: [PATCH 05/12] no need to set LD nowadays

[Phil Blundell]

On Tue, 2010-02-09 at 09:50 +0100, Bernhard Reutner-Fischer wrote:
> It seems that the .dev tree has 1.2.1, 1.2.2, 1.3.1 still in there but
> i, personally would strongly advise against using those (same for the
> standalone tinylogin, but that's a different thing and not relevant
> right now).

As long as those versions are there, I don't think it would be
acceptable to check in a patch to busybox.inc which would delete them.
Leaving the ${LD} setting as a comment doesn't really help with that.

If you wanted to generate a new patch which added the ${LD} setting to
the individual recipes that still require it, and simultaneously delete
it from busybox.inc, then I think that would be fine. 

p.

Re: [PATCH 02/12] some more !getopt_long fixes

[Jens Seidel]

On Mon, Feb 08, 2010 at 10:14:23PM +0100, Bernhard Reutner-Fischer wrote:
> -                if [ "$VERBOSE" != no ]
> +                if [ "$VERBOSE" != "no" ]

I don't see any need for this change. Why doesn't the commit message does
not explain why it was done?

I assume it is a stylistic change only and should that's why committed
separately (with a different commit log), right?

Jens

Re: [PATCH 06/12] quilt: use builtin date routines

[Phil Blundell]

On Mon, 2010-02-08 at 22:14 +0100, Bernhard Reutner-Fischer wrote:
> quilt tries to use an RFC822 date format which is obsoleted
> by rfc2822 since 8 years now.
> It has a builtin date handler, so use that and not the date
> binary (which may only support rfc2822 by now, as busybox does)

Thanks for the patch.  I checked this in.

p.

Re: [PATCH 09/12] flex: remove version specifics from generic inc

[Phil Blundell]

On Mon, 2010-02-08 at 22:14 +0100, Bernhard Reutner-Fischer wrote:
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> ---
>  recipes/flex/flex-native_2.5.31.bb |    4 ++--
>  recipes/flex/flex.inc              |    3 ---
>  recipes/flex/flex_2.5.31.bb        |    5 ++++-
>  3 files changed, 6 insertions(+), 6 deletions(-)

Thanks for the patch.  I checked this in.

p.

Re: [PATCH 04/12] matchbox-panel-2: fix DEPENDS

[Phil Blundell]

On Mon, 2010-02-08 at 22:14 +0100, Bernhard Reutner-Fischer wrote:
> libacpi has no recipe as opposed to acpid
> 
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> ---
>  recipes/matchbox2/matchbox-panel-2_svn.bb |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Um, really?  I do seem to have a recipe for libacpi in my tree.

-rw-r--r-- 1 pb pb 463 Nov 23 14:53 recipes/libacpi/libacpi_0.2.bb

Also, from a quick look at the acpid package, it doesn't seem to stage
any libraries or headers so it is not clear to me that it would actually
satisfy matchbox-panel-2's requirements.  Did you verify that
matchbox-panel-2's ACPI code really is buildable with your patch
applied?

p.

Re: [PATCH 01/12] trim superfluous trailing whitespace

[Phil Blundell]

On Mon, 2010-02-08 at 22:14 +0100, Bernhard Reutner-Fischer wrote:
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
> ---
>  recipes/busybox/busybox.inc |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

Thanks for the patch.  I checked this in.

p.

Re: [PATCH 02/12] some more !getopt_long fixes

[Bernhard Reutner-Fischer]

On Tue, Feb 09, 2010 at 10:38:00AM +0100, Jens Seidel wrote:
>On Mon, Feb 08, 2010 at 10:14:23PM +0100, Bernhard Reutner-Fischer wrote:
>> -                if [ "$VERBOSE" != no ]
>> +                if [ "$VERBOSE" != "no" ]
>
>I don't see any need for this change. Why doesn't the commit message does
>not explain why it was done?
>
>I assume it is a stylistic change only and should that's why committed
>separately (with a different commit log), right?

Yes, it is a stylistic change only and could be committed separately.
I'll factor them out and resend.

Re: [PATCH 05/12] no need to set LD nowadays

[Bernhard Reutner-Fischer]

On Tue, Feb 09, 2010 at 08:56:50AM +0000, Phil Blundell wrote:
>On Tue, 2010-02-09 at 09:50 +0100, Bernhard Reutner-Fischer wrote:
>> It seems that the .dev tree has 1.2.1, 1.2.2, 1.3.1 still in there but
>> i, personally would strongly advise against using those (same for the
>> standalone tinylogin, but that's a different thing and not relevant
>> right now).
>
>As long as those versions are there, I don't think it would be
>acceptable to check in a patch to busybox.inc which would delete them.
>Leaving the ${LD} setting as a comment doesn't really help with that.
>
>If you wanted to generate a new patch which added the ${LD} setting to
>the individual recipes that still require it, and simultaneously delete
>it from busybox.inc, then I think that would be fine. 

Ack, i retract this patch for now.
Thanks,

Re: [PATCH 04/12] matchbox-panel-2: fix DEPENDS

[Bernhard Reutner-Fischer]

On Tue, Feb 09, 2010 at 11:58:15AM +0000, Phil Blundell wrote:
>On Mon, 2010-02-08 at 22:14 +0100, Bernhard Reutner-Fischer wrote:
>> libacpi has no recipe as opposed to acpid
>> 
>> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
>> ---
>>  recipes/matchbox2/matchbox-panel-2_svn.bb |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>
>Um, really?  I do seem to have a recipe for libacpi in my tree.

Oh, there was none in september. I withdraw this patch (and sorry for
not re-checking. Will do from now on..)

Thanks,

Re: [PATCH 03/12] osso-application-installer: nonworking

[Bernhard Reutner-Fischer]

On Mon, Feb 08, 2010 at 10:14:24PM +0100, Bernhard Reutner-Fischer wrote:
>osso-application-installer depends on nonworking hildon-lgpl

I hereby withdraw this 'bitbake help' hinting on 'world' prompted but
severely misguided attempt from september to get that world straight.
Sorry and cheers,
Bernhard

PS: +1 for teaching bitbake to emit sensible targets within reach.. :/

Re: [PATCH 00/12] misc trivia

[Bernhard Reutner-Fischer]

On Mon, Feb 08, 2010 at 10:14:22PM +0100, Bernhard Reutner-Fischer wrote:

All were applied or retracted except these 2 patches that asked for
refactoring and which were resent accordingly today:

Jens Seidel:
resent as [PATCH 1/8] hwclock.sh: some more !getopt_long fixes [was: [PATCH 02/12] some more !getopt_long fixes]
Phil Blundell:
dropped, now [PATCH 5/8] busybox: use .tar.bz2 [was: [PATCH 05/12] no need to set LD nowadays]

Thanks!

Re: [PATCH 07/12] Document proxy setup in local.conf.sample

[Denys Dmytriyenko]

On Mon, Feb 08, 2010 at 10:14:28PM +0100, Bernhard Reutner-Fischer wrote:
> diff --git a/conf/local.conf.sample b/conf/local.conf.sample
> index 643ae0b..e7c4559 100644
> --- a/conf/local.conf.sample
> +++ b/conf/local.conf.sample
> @@ -30,6 +30,9 @@ BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
>  # This is a regulary expression, so be sure to get your parenthesis balanced.
>  BBMASK = ""
>  
> +# Proxy settings:
> +# BB_ENV_EXTRAWHITE="http_proxy ftp_proxy no_proxy"

I'm sorry to inform you, but that won't work with the standard bitbake! Which 
uses own HTTP_PROXY, FTP_PROXY, HTTP_PROXY_IGNORE and FTP_PROXY_IGNORE vars.

I tried to persuade RP to change that back to standard http_proxy, ftp_proxy 
and no_proxy to no avail[1].

Because of that I had to keep my own version of bitbake[2] with the necessary 
patches for my users - check the top 4 patches in that tree. Although, 
GIT_PROXY_COMMAND one is already in the bitbake master...

And looks like Khem has already pushed the above change though...

[1] http://thread.gmane.org/gmane.comp.handhelds.openembedded/19716
[2] http://arago-project.org/git/?p=arago-bitbake.git;a=shortlog;h=refs/heads/next

-- 
Denys

Re: [PATCH 12/12] task-base.bb: use uniform test for set

[Phil Blundell]

On Mon, 2010-02-08 at 22:14 +0100, Bernhard Reutner-Fischer wrote: 
> -    if not hasattr(__builtins__, 'set'):
> +    try:
> +	set
> +    except NameError:
>  	from sets import Set as set

It's not completely obvious to me that this patch is an improvement: it
replaces a single line of code with three new ones and doesn't seem to
change the outcome.  Maybe one of our Python überhackers can comment on
whether or not this is really better.

p.

Re: [PATCH 12/12] task-base.bb: use uniform test for set

[Khem Raj]

On Thu, Feb 11, 2010 at 5:04 AM, Phil Blundell <philb@gnu.org> wrote:
> On Mon, 2010-02-08 at 22:14 +0100, Bernhard Reutner-Fischer wrote:
>> -    if not hasattr(__builtins__, 'set'):
>> +    try:
>> +     set
>> +    except NameError:
>>       from sets import Set as set
>
> It's not completely obvious to me that this patch is an improvement: it
> replaces a single line of code with three new ones and doesn't seem to
> change the outcome.  Maybe one of our Python überhackers can comment on
> whether or not this is really better.

hasatts uses getattr and catches the exception from getattr. There was
a problem in hasattr where it returned False on
any exception generated from getaddr so the result could be
unreliable. But this may not be applicable in this particular case

I still see

NOTE: Handling BitBake files: \ (7015/8051) [87 %]__builtin__:10:
DeprecationWarning: the sets module is deprecated
NOTE: Handling BitBake files: | (8051/8051) [100 %]
Parsing of 8051 .bb files complete (0 cached, 8051 parsed). 7800
targets, 333 skipped, 157 masked, 0 errors.



>
> p.
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH 07/12] Document proxy setup in local.conf.sample

[Bernhard Reutner-Fischer]

On Thu, Feb 11, 2010 at 04:04:37AM -0500, Denys Dmytriyenko wrote:
>On Mon, Feb 08, 2010 at 10:14:28PM +0100, Bernhard Reutner-Fischer wrote:
>> diff --git a/conf/local.conf.sample b/conf/local.conf.sample
>> index 643ae0b..e7c4559 100644
>> --- a/conf/local.conf.sample
>> +++ b/conf/local.conf.sample
>> @@ -30,6 +30,9 @@ BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
>>  # This is a regulary expression, so be sure to get your parenthesis balanced.
>>  BBMASK = ""
>>  
>> +# Proxy settings:
>> +# BB_ENV_EXTRAWHITE="http_proxy ftp_proxy no_proxy"
>
>I'm sorry to inform you, but that won't work with the standard bitbake! Which 
>uses own HTTP_PROXY, FTP_PROXY, HTTP_PROXY_IGNORE and FTP_PROXY_IGNORE vars.
>
>I tried to persuade RP to change that back to standard http_proxy, ftp_proxy 
>and no_proxy to no avail[1].
>
>Because of that I had to keep my own version of bitbake[2] with the necessary 
>patches for my users - check the top 4 patches in that tree. Although, 
>GIT_PROXY_COMMAND one is already in the bitbake master...
>
>And looks like Khem has already pushed the above change though...

drats, you're right. I was erroneously checking against a patched bitbake.

khem, i'm very sorry for my sloppiness! Please
revert 3f602f72f0936ef773aa4767636d41bb82ecf3b0 :
---8<---
Unfortunately bitbake master allegedly uses the non-standard
{HT,F}TP_PROXY{,_IGNORE} config variables instead of the established
http_proxy, ftp_proxy, no_proxy environment variables.
---8<---
lynx has a good description for these, and especially a sane rule
for no_proxy (with domain.tld:port csv entries) which works very well
for me in practise, FYI.
http://lynx.isc.org/lynx2.8.5/lynx2-8-5/lynx_help/keystrokes/environments.html#proxy

Sorry for the wrong patch and thanks, Denys, for mentioning this!
>
>[1] http://thread.gmane.org/gmane.comp.handhelds.openembedded/19716
>[2] http://arago-project.org/git/?p=arago-bitbake.git;a=shortlog;h=refs/heads/next

Re: [PATCH 07/12] Document proxy setup in local.conf.sample

[Denys Dmytriyenko]

On Sat, Feb 13, 2010 at 01:08:20PM +0100, Bernhard Reutner-Fischer wrote:
> On Thu, Feb 11, 2010 at 04:04:37AM -0500, Denys Dmytriyenko wrote:
> >On Mon, Feb 08, 2010 at 10:14:28PM +0100, Bernhard Reutner-Fischer wrote:
> >> diff --git a/conf/local.conf.sample b/conf/local.conf.sample
> >> index 643ae0b..e7c4559 100644
> >> --- a/conf/local.conf.sample
> >> +++ b/conf/local.conf.sample
> >> @@ -30,6 +30,9 @@ BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
> >>  # This is a regulary expression, so be sure to get your parenthesis balanced.
> >>  BBMASK = ""
> >>  
> >> +# Proxy settings:
> >> +# BB_ENV_EXTRAWHITE="http_proxy ftp_proxy no_proxy"
> >
> >I'm sorry to inform you, but that won't work with the standard bitbake! Which 
> >uses own HTTP_PROXY, FTP_PROXY, HTTP_PROXY_IGNORE and FTP_PROXY_IGNORE vars.
> >
> >I tried to persuade RP to change that back to standard http_proxy, ftp_proxy 
> >and no_proxy to no avail[1].
> >
> >Because of that I had to keep my own version of bitbake[2] with the necessary 
> >patches for my users - check the top 4 patches in that tree. Although, 
> >GIT_PROXY_COMMAND one is already in the bitbake master...
> >
> >And looks like Khem has already pushed the above change though...
> 
> drats, you're right. I was erroneously checking against a patched bitbake.
> 
> khem, i'm very sorry for my sloppiness! Please
> revert 3f602f72f0936ef773aa4767636d41bb82ecf3b0 :

Reverted.

> ---8<---
> Unfortunately bitbake master allegedly uses the non-standard
> {HT,F}TP_PROXY{,_IGNORE} config variables instead of the established
> http_proxy, ftp_proxy, no_proxy environment variables.
> ---8<---
> lynx has a good description for these, and especially a sane rule
> for no_proxy (with domain.tld:port csv entries) which works very well
> for me in practise, FYI.
> http://lynx.isc.org/lynx2.8.5/lynx2-8-5/lynx_help/keystrokes/environments.html#proxy
> 
> Sorry for the wrong patch and thanks, Denys, for mentioning this!
> >
> >[1] http://thread.gmane.org/gmane.comp.handhelds.openembedded/19716
> >[2] http://arago-project.org/git/?p=arago-bitbake.git;a=shortlog;h=refs/heads/next

-- 
Denys