Skip to contentSkip to conversation

error in push of origin/org.openmbedded.dev

PATCH Paul Menzel 3 participants 7 messages May 3, 2011 – May 4, 2011

lore
Share & tools
lore
#0 lore raw

Dear Florian,

you pushed to org.open*mb*edded.dev and therefore a new branch was created.

Before you push to the correct branch could you maybe clean up the commit log using git rebase -i … or take the improved patches I attached.

I removed the wrong and reverted commit and for the ProFTP recipe I put PR = "r0".

Looking through the commits it would be better to review them first on the list in my opinion since they still have small style errors.

Thanks,

Paul

From f37d85c44915831673924d0397f2685a3dc4b18d Mon Sep 17 00:00:00 2001
From: Florian Boor <[email protected]>
Date: Fri, 29 Jan 2010 13:11:18 +0100
Subject: [PATCH] ushare: We need lsb-base in the filesystem.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ushare does not start up properly without scripts from lsb-base. Tested in µCross

---
 recipes/ushare/ushare_1.1a.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
recipes/ushare/ushare_1.1a.bb +3 -0
index 8c58374..002a0f7 100644
@@ -2,6 +2,9 @@ DESCRIPTION = "ushare is a UPnP media server"
 LICENSE = "GPL"
 HOMEPAGE = "http://ushare.geexbox.org/"
 DEPENDS = "libupnp virtual/libiconv virtual/libintl"
+RDEPENDS = "lsb-base"
+PR = "r1"
+
 SRC_URI = "http://ushare.geexbox.org/releases/ushare-${PV}.tar.bz2"
 S = "${WORKDIR}/ushare-${PV}"
 
Signature · 1 line
1.7.4.4

From 522bfbdb062745aab17d683a5ad133a20a7411ca Mon Sep 17 00:00:00 2001
From: Florian Boor <[email protected]>
Date: Thu, 4 Nov 2010 23:52:56 +0100
Subject: [PATCH] lsb-base: Package for LSB init-functions script

---
 recipes/lsb/lsb-base_3.2.bb |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 recipes/lsb/lsb-base_3.2.bb
recipes/lsb/lsb-base_3.2.bb new file +20 -0
new file mode 100644
index 0000000..213f3de
@@ -0,0 +1,20 @@
+DESCRIPTION = "Miscellaneous files for the base system."
+SECTION = "base"
+PRIORITY = "optional"
+PR = "r0"
+LICENSE = "BSD"
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://ftp.de.debian.org/debian/pool/main/l/lsb/lsb_3.2-23.tar.gz"
+
+FILES_${PN} = "/lib/lsb"
+
+S = "${WORKDIR}/lsb-3.2"
+
+do_compile () {
+}
+
+do_install () {
+	install -d ${D}/lib/lsb
+	install -m 755 init-functions ${D}/lib/lsb/
+}
Signature · 1 line
1.7.4.4

From c7e70517178dcd0c3d8d74e3d534a02383e26176 Mon Sep 17 00:00:00 2001
From: Florian Boor <[email protected]>
Date: Thu, 4 Nov 2010 22:36:07 +0100
Subject: [PATCH] zenity: add gnome-doc-utils to DEPENDS

---
 recipes/gnome/zenity_2.28.0.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/gnome/zenity_2.28.0.bb +1 -1
index 65643ae..a5a5a1b 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "A tool to display dialogs from the command line and shell scripts."
 LICENSE = "GPL"
 
-DEPENDS = "gtk+ libglade glib-2.0 libnotify"
+DEPENDS = "gtk+ libglade glib-2.0 libnotify gnome-doc-utils"
 
 inherit gnome
 
Signature · 1 line
1.7.4.4

From 361adffbb4ceae96b86fe585b21cf123ede8b849 Mon Sep 17 00:00:00 2001
From: Florian Boor <[email protected]>
Date: Fri, 5 Nov 2010 00:34:44 +0100
Subject: [PATCH] ubootchart: Add recipe for SVN version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A small and easy to use boot process profiler generating bootchart compatible output. From µCross, tested on armv5te platforms and other.

---
 recipes/ubootchart/ubootchart_svn.bb |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100644 recipes/ubootchart/ubootchart_svn.bb
recipes/ubootchart/ubootchart_svn.bb new file +27 -0
new file mode 100644
index 0000000..835638c
@@ -0,0 +1,27 @@
+DESCRIPTION = "A boot profiling tool"
+HOMEPAGE = "http://code.google.com/p/ubootchart/"
+LICENSE="GPLv3"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+SRCREV_pn-ubootchart ?= "12"
+
+SRC_URI="svn://ubootchart.googlecode.com/svn/;proto=http;module=trunk"
+S = "${WORKDIR}/trunk"
+
+
+do_patch() {
+    sed -i "s/@VERSION@/${PV}-${PR}/" ${S}/ubootchartd
+}
+
+do_compile() {
+        ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} ${INCLUDES} ${S}/ubootchartd_bin.c -o ubootchartd_bin
+}
+
+do_install() {
+        install -m 0755 -d ${D}/sbin ${D}/etc/ubootchart ${D}${docdir}/ubootchart
+        install -m 0755 ${S}/ubootchartd_bin ${D}/sbin
+        install -m 0755 ${S}/ubootchartd ${D}/sbin
+        install -m 0644 ${S}/ubootchart.conf ${D}/etc/ubootchart
+        install -m 0755 ${S}/start.sh ${D}/etc/ubootchart
+        install -m 0755 ${S}/finish.sh ${D}/etc/ubootchart
+}
Signature · 1 line
1.7.4.4

From 85a33814eee93e8c933c6b37aada9149f6c62147 Mon Sep 17 00:00:00 2001
From: Florian Boor <[email protected]>
Date: Mon, 22 Nov 2010 11:29:07 +0100
Subject: [PATCH] proftpd: Add version 1.3.3c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update in order to get rid of several vulnerabilities of previous releases.

---
»update« seemed misleading since no other version was removed.

---
 .../proftpd/files/proftpd-install-nostrip.patch    |   13 ++++++++
 recipes/proftpd/proftpd_1.3.3c.bb                  |   33 ++++++++++++++++++++
 2 files changed, 46 insertions(+), 0 deletions(-)
 create mode 100644 recipes/proftpd/files/proftpd-install-nostrip.patch
 create mode 100644 recipes/proftpd/proftpd_1.3.3c.bb
recipes/proftpd/files/proftpd-install-nostrip.patch new file +13 -0
new file mode 100644
index 0000000..8dbcfc0
@@ -0,0 +1,13 @@
+--- a/Make.rules.in~	2010-11-22 13:37:25.000000000 +0100
++++ b/Make.rules.in	2010-11-22 13:38:55.100022169 +0100
+@@ -28,8 +28,8 @@
+ INSTALL=@INSTALL@
+ INSTALL_USER=@install_user@
+ INSTALL_GROUP=@install_group@
+-INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -m 0755
+-INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -m 0755
++INSTALL_BIN=$(INSTALL) -m 0755
++INSTALL_SBIN=$(INSTALL) -m 0755
+ INSTALL_MAN=$(INSTALL) -m 0644
+ 
+ RM=rm -f
recipes/proftpd/proftpd_1.3.3c.bb new file +33 -0
new file mode 100644
index 0000000..3bf4745
@@ -0,0 +1,33 @@
+DESCRIPTION = "Secure ftp daemon"
+SECTION = "console/network"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz \
+	file://make.patch \
+	file://proftpd-install-nostrip.patch \
+	"
+
+
+EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes --disable-cap"
+LDFLAGS += "-Llib"
+PARALLEL_MAKE = ""
+
+do_configure () {
+	 ./configure \
+		   --disable-auth-pam \
+                   --build=${BUILD_SYS} \
+                   --host=${HOST_SYS} \
+                   --target=${TARGET_SYS} \
+                   --prefix=/usr \
+		   --sysconfdir=/etc \
+		   --sharedstatedir=/com \
+		   --localstatedir=/var \
+                   ${EXTRA_OECONF} \
+                   $@;
+}
+
+pkg_postinst () {
+	# more chown's might be needed
+        chown root:root /usr/sbin/proftpd
+}
Signature · 1 line
1.7.4.4

From 19f4108edbf8d8c9883c51fa9bb1277b037b901e Mon Sep 17 00:00:00 2001
From: Florian Boor <[email protected]>
Date: Thu, 25 Nov 2010 00:13:37 +0100
Subject: [PATCH] zbar: Add version 0.10

---
 recipes/zbar/{zbar_0.8.bb => zbar_0.10.bb} |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 copy recipes/zbar/{zbar_0.8.bb => zbar_0.10.bb} (81%)
recipes/zbar/zbar_0.10.bb renamed from recipes/zbar/zbar_0.8.bb +3 -3
similarity index 81%
copy from recipes/zbar/zbar_0.8.bb
copy to recipes/zbar/zbar_0.10.bb
index 05ecf6b..fb185d6 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "2D barcode scanner toolkit."
 SECTION = "graphics"
 LICENSE = "GPL"
 DEPENDS = "intltool-native gtk+ libpng jpeg"
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.bz2"
 
@@ -20,5 +20,5 @@ FILES_libzbar-dev = "${libdir}/libzbar.so ${libdir}/libzbar.*a ${includedir}/zba
 FILES_libzbargtk = "${libdir}/libzbargtk.so.*"
 FILES_libzbargtk-dev = "${libdir}/libzbargtk.so ${libdir}/libzbargtk.*a"
 
-SRC_URI[md5sum] = "b5b0efd92af16230ce9952e7a9a671fd"
-SRC_URI[sha256sum] = "5415ffde882c7f7acee58e8a36aa65e732cfcfbbb582669480d6cf9549edfbbc"
+SRC_URI[md5sum] = "0fd61eb590ac1bab62a77913c8b086a5"
+SRC_URI[sha256sum] = "234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6"
Signature · 1 line
1.7.4.4

From 2497edd853c45455a10e309a0790f132f78b6699 Mon Sep 17 00:00:00 2001
From: Florian Boor <[email protected]>
Date: Fri, 7 Jan 2011 15:06:05 +0100
Subject: [PATCH] gpe-lights: fix license

---
The sentence in the commit log was redundant.

---
 recipes/gpe-lights/gpe-lights_0.13.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/gpe-lights/gpe-lights_0.13.bb +2 -2
index 1930ae9..5968a61 100644
@@ -1,11 +1,11 @@
 inherit gpe
-LICENSE = "PD"
+LICENSE = "GPLv2+"
 
 DESCRIPTION = "A simple light puzzle."
 DEPENDS = "gtk+ libgpewidget gpe-icons"
 SECTION = "gpe/games"
 PRIORITY = "optional"
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://fix-makefiles.patch"
 
Signature · 1 line
1.7.4.4
#1 lore raw

Hi Paul,

Am 03.05.2011 16:54, schrieb Paul Menzel:

Quoted 2 lines

you pushed to org.open*mb*edded.dev and therefore a new branch was created.

Args - sorry my bad, I have a typo in the local branch name. Interesting what can happen working on a fresh tree :-)

Quoted 3 lines

Before you push to the correct branch could you maybe clean up the commit log using git rebase -i … or take the improved patches I attached.

Ok great - many tanks. What else did you change?

Greetings

Florian

Signature · 5 lines
The dream of yesterday                  Florian Boor
is the hope of today                    Tel: +49 271-771091-15
and the reality of tomorrow.            Fax: +49 271-771091-19
[Robert Hutchings Goddard, 1904]        [email protected]
                                        http://www.kernelconcepts.de/en
#2 lore raw

Dear Florian,

Am Dienstag, den 03.05.2011, 17:03 +0200 schrieb Florian Boor:

Quoted 4 lines

Am 03.05.2011 16:54, schrieb Paul Menzel:

Quoted 2 lines

you pushed to org.open*mb*edded.dev and therefore a new branch was created.

Quoted 8 lines

Args - sorry my bad, I have a typo in the local branch name. Interesting what can happen working on a fresh tree :-)

Quoted 3 lines

Before you push to the correct branch could you maybe clean up the commit log using git rebase -i … or take the improved patches I attached.

Ok great - many tanks. What else did you change?

I also squashed the ubootchart commits. Everything else was just the commit messages.

Somehow Git should be able to show the differences, but

	$ git diff origin/master -- origin/org.openmbedded.dev

does not work for me.

Thanks,

Paul

#3 lore raw

Dear Florian,

Am Dienstag, den 03.05.2011, 17:18 +0200 schrieb Paul Menzel:

Quoted 15 lines

Am Dienstag, den 03.05.2011, 17:03 +0200 schrieb Florian Boor:

Quoted 4 lines

Am 03.05.2011 16:54, schrieb Paul Menzel:

Quoted 2 lines

you pushed to org.open*mb*edded.dev and therefore a new branch was created.

Quoted 8 lines

Args - sorry my bad, I have a typo in the local branch name. Interesting what can happen working on a fresh tree :-)

Quoted 3 lines

Before you push to the correct branch could you maybe clean up the commit log using git rebase -i … or take the improved patches I attached.

Ok great - many tanks. What else did you change?

Quoted 8 lines

I also squashed the ubootchart commits. Everything else was just the commit messages.

Somehow Git should be able to show the differences, but

	$ git diff origin/master -- origin/org.openmbedded.dev

does not work for me.

it would have been better to first commit the new recipe lsb-base [2] before using it in ushare [1] to preserve a working tree.

Thanks,

Paul

PS: If anyone cares, the error message for the commit for Zenity [3] is the following.

[…]
autoreconf: running: automake --foreign --add-missing --copy --force-missing --warnings=cross
automake: unknown warning category `cross'
gnome-doc-utils.make:63: HAVE_GNOME_DOC_UTILS does not appear in AM_CONDITIONAL
help/Makefile.am:1: `gnome-doc-utils.make' included from here
gnome-doc-utils.make:133: ENABLE_SK does not appear in AM_CONDITIONAL
help/Makefile.am:1: `gnome-doc-utils.make' included from here
gnome-doc-utils.make:182: ENABLE_SK does not appear in AM_CONDITIONAL
help/Makefile.am:1: `gnome-doc-utils.make' included from here
autoreconf: automake failed with exit status: 1
+ oefatal 'autoreconf execution failed.'
+ echo FATAL: 'autoreconf execution failed.'
FATAL: autoreconf execution failed.
+ exit 1

[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=0fd385ef5512def0db880139b1c9fa78f652f494
[2] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=419cb686b0bfe393f7c350ac881b46e8e2a14795
[3] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=35393002bb5aa476e281a004f7dc64aeefcb2c9e

#4 lore raw
In reply to Paul Menzel

Dear Florian,

Am Dienstag, den 03.05.2011, 17:18 +0200 schrieb Paul Menzel:

Quoted 9 lines

Am Dienstag, den 03.05.2011, 17:03 +0200 schrieb Florian Boor:

Quoted 7 lines

Am 03.05.2011 16:54, schrieb Paul Menzel:

Quoted 2 lines

you pushed to org.open*mb*edded.dev and therefore a new branch was created.

Args - sorry my bad, I have a typo in the local branch name. Interesting what can happen working on a fresh tree :-)

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Before you push to the correct branch could you maybe clean up the commit log using git rebase -i … or take the improved patches I attached.

Ok great - many tanks. What else did you change?

I also squashed the ubootchart commits. Everything else was just the commit messages.

[…]

task fetch of lsb-base fails

        […]
        NOTE: package lsb-base-3.2-r0: task do_fetch: Started
        --2011-05-04 13:26:04--  http://ftp.de.debian.org/debian/pool/main/l/lsb/lsb_3.2-23.tar.gz
         Resolving ftp.de.debian.org... 141.76.2.4
         Connecting to ftp.de.debian.org|141.76.2.4|:80... connected.
         HTTP request sent, awaiting response... 404 Not Found
         2011-05-04 13:26:05 ERROR 404: Not Found.
        […]

and task patch of proftpd fails too.

NOTE: package proftpd-1.3.3c-r0: task do_patch: Started
ERROR: Execution of 'quilt --quiltrc=/oe/build-angstrom-next/angstrom-dev/sysroots/i686-linux/usr/bin/quiltrc push' failed with exit code 1:
Applying patch proftpd-install-nostrip.patch
patching file Make.rules.in
Hunk #1 FAILED at 28.
1 out of 1 hunk FAILED -- rejects in file Make.rules.in
Patch proftpd-install-nostrip.patch can be reverse-applied

NOTE: package proftpd-1.3.3c-r0: task patch_do_patch: Failed
ERROR: Function 'patch_do_patch' failed
ERROR: Task 1 (/oe/openembedded/recipes/proftpd/proftpd_1.3.3c.bb, do_patch) failed with exit code '1'
ERROR: '/oe/openembedded/recipes/proftpd/proftpd_1.3.3c.bb' failed

Could you please take a look.

Thanks,

Paul

#5 lore raw

Hi Paul,

Am 04.05.2011 14:22, schrieb Paul Menzel:

Quoted 1 line

Could you please take a look.

oh well... if things fail they fail completely :-(

I will take a look this evening.

Greetings

Florian

Signature · 5 lines
The dream of yesterday                  Florian Boor
is the hope of today                    Tel: +49 271-771091-15
and the reality of tomorrow.            Fax: +49 271-771091-19
[Robert Hutchings Goddard, 1904]        [email protected]
                                        http://www.kernelconcepts.de/en
#6 lore raw
In reply to Florian Boor
Quoted 6 lines · Florian Boor

Am 03.05.2011 16:54, schrieb Paul Menzel:

Quoted 2 lines

you pushed to org.open*mb*edded.dev and therefore a new branch was created.

Args - sorry my bad, I have a typo in the local branch name. Interesting what can happen working on a fresh tree :-)

All the more reason to use master, which is less prone to such typos. org.openembedded.dev is just a compatibility pointer at master, master is the real branch.

Signature · 5 lines
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics