Skip to contentSkip to conversation

package/rpi-userland: update to fix no-longer applying patch

PATCH New Yann E. MORIN 5 participants 9 messages Feb 10, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/rpi-userland: update to fix no-longer applying patch

Our patches do not apply as-is against the version of rpi-userland we package (weird...).

Since rpi-userland does not have releases, and is a relatively fast-moving target, just bump the version to the latest cset from the git tree, and get rid of one our failing patch, since it was applied upstream.

Cc Maxime Hadjinlian <[email protected]>
---
 ...0002-Test-for-the-existence-of-execinfo-h.patch |   69 --------------------
 package/rpi-userland/rpi-userland.mk               |    2 +-
 2 files changed, 1 insertions(+), 70 deletions(-)
 delete mode 100644 package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch
package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch deleted +0 -69
deleted file mode 100644
index ccc67d9..0000000
@@ -1,69 +0,0 @@
-From 93ae1bcd8005216baf7361ba860b53a2cf2e0401 Mon Sep 17 00:00:00 2001
-From: Floris Bos <[email protected]>
-Date: Sun, 25 Nov 2012 19:05:07 +0100
-Subject: [PATCH] Test for the existence of execinfo.h
-
-Previous code assumed that on Linux the execinfo.h functions are always available, which is a glibc extension.
-This change fixes building the library under buildroot, which uses uClibc by default
----
- interface/vcos/glibc/vcos_backtrace.c |    7 +++++--
- makefiles/cmake/arm-linux.cmake       |    4 ++++
- makefiles/cmake/cmake_config.h.in     |    3 +++
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/interface/vcos/glibc/vcos_backtrace.c b/interface/vcos/glibc/vcos_backtrace.c
-index 474a328..3bb8aa3 100644
---- a/interface/vcos/glibc/vcos_backtrace.c
-+++ b/interface/vcos/glibc/vcos_backtrace.c
-@@ -26,7 +26,10 @@
- */
- 
- #include <interface/vcos/vcos.h>
--#ifdef __linux__
-+#ifdef HAVE_CMAKE_CONFIG
-+#include "cmake_config.h"
-+#endif
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
- #endif
- #include <stdio.h>
-@@ -35,7 +38,7 @@
- 
- void vcos_backtrace_self(void)
- {
--#ifdef __linux__
-+#ifdef HAVE_EXECINFO_H
-    void *stack[64];
-    int depth = backtrace(stack, sizeof(stack)/sizeof(stack[0]));
-    char **names = backtrace_symbols(stack, depth);
-diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake
-index 89d8bbf..6f2114f 100644
---- a/makefiles/cmake/arm-linux.cmake
-+++ b/makefiles/cmake/arm-linux.cmake
-@@ -115,6 +115,10 @@ try_compile(HAVE_MTRACE
-             ${CMAKE_SOURCE_DIR}/makefiles/cmake/srcs/test-mtrace.c
-             OUTPUT_VARIABLE foo)
- 
-+# test for existence of execinfo.h header
-+include(CheckIncludeFile)
-+check_include_file(execinfo.h HAVE_EXECINFO_H)
-+
- add_definitions(-DHAVE_CMAKE_CONFIG)
- configure_file (
-     "makefiles/cmake/cmake_config.h.in"
-diff --git a/makefiles/cmake/cmake_config.h.in b/makefiles/cmake/cmake_config.h.in
-index 5f08ad5..080b8e8 100644
---- a/makefiles/cmake/cmake_config.h.in
-+++ b/makefiles/cmake/cmake_config.h.in
-@@ -8,5 +8,8 @@
- /** Do we have support for GLIBC mtrace() ? */
- #cmakedefine                    HAVE_MTRACE
- 
-+/** Do we have the execinfo.h include file ? */
-+#cmakedefine                    HAVE_EXECINFO_H
-+
- #endif
- 
--- 
-1.7.10
-
package/rpi-userland/rpi-userland.mk +1 -1
index ece37d4..522a97f 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-RPI_USERLAND_VERSION = 9852ce28826889e50c4d6786b942f51bccccac54
+RPI_USERLAND_VERSION = 5e9a740a88a889dfc8a18bb1b00c17e5dd9d0108
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILE = LICENCE
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH 1/1 package/rpi-userland: update to fix no-longer applying patch

Hi all,

I haven't tested this patch yet, but it seems all good. The inclusion of Floris Bos's patch was done by this commit :
https://github.com/raspberrypi/userland/commit/f7b1cad78497c65e59715d78be2b4fc9c63708c1

As Yann noted, I find interesting that the patch did not apply although we haven't bumped the version... I'll try to look into that.

Quoted 106 lines · Yann E. MORIN

Our patches do not apply as-is against the version of rpi-userland we package (weird...).

Since rpi-userland does not have releases, and is a relatively fast-moving target, just bump the version to the latest cset from the git tree, and get rid of one our failing patch, since it was applied upstream.

Cc Maxime Hadjinlian <[email protected]>
---
 ...0002-Test-for-the-existence-of-execinfo-h.patch |   69 --------------------
 package/rpi-userland/rpi-userland.mk               |    2 +-
 2 files changed, 1 insertions(+), 70 deletions(-)
 delete mode 100644 package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch
package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch deleted +0 -69
deleted file mode 100644
index ccc67d9..0000000
@@ -1,69 +0,0 @@
-From 93ae1bcd8005216baf7361ba860b53a2cf2e0401 Mon Sep 17 00:00:00 2001
-From: Floris Bos <[email protected]>
-Date: Sun, 25 Nov 2012 19:05:07 +0100
-Subject: [PATCH] Test for the existence of execinfo.h
-
-Previous code assumed that on Linux the execinfo.h functions are always available, which is a glibc extension.
-This change fixes building the library under buildroot, which uses uClibc by default
----
- interface/vcos/glibc/vcos_backtrace.c |    7 +++++--
- makefiles/cmake/arm-linux.cmake       |    4 ++++
- makefiles/cmake/cmake_config.h.in     |    3 +++
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/interface/vcos/glibc/vcos_backtrace.c b/interface/vcos/glibc/vcos_backtrace.c
-index 474a328..3bb8aa3 100644
---- a/interface/vcos/glibc/vcos_backtrace.c
-+++ b/interface/vcos/glibc/vcos_backtrace.c
-@@ -26,7 +26,10 @@
- */
-
- #include <interface/vcos/vcos.h>
--#ifdef __linux__
-+#ifdef HAVE_CMAKE_CONFIG
-+#include "cmake_config.h"
-+#endif
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
- #endif
- #include <stdio.h>
-@@ -35,7 +38,7 @@
-
- void vcos_backtrace_self(void)
- {
--#ifdef __linux__
-+#ifdef HAVE_EXECINFO_H
-    void *stack[64];
-    int depth = backtrace(stack, sizeof(stack)/sizeof(stack[0]));
-    char **names = backtrace_symbols(stack, depth);
-diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake
-index 89d8bbf..6f2114f 100644
---- a/makefiles/cmake/arm-linux.cmake
-+++ b/makefiles/cmake/arm-linux.cmake
-@@ -115,6 +115,10 @@ try_compile(HAVE_MTRACE
-             ${CMAKE_SOURCE_DIR}/makefiles/cmake/srcs/test-mtrace.c
-             OUTPUT_VARIABLE foo)
-
-+# test for existence of execinfo.h header
-+include(CheckIncludeFile)
-+check_include_file(execinfo.h HAVE_EXECINFO_H)
-+
- add_definitions(-DHAVE_CMAKE_CONFIG)
- configure_file (
-     "makefiles/cmake/cmake_config.h.in"
-diff --git a/makefiles/cmake/cmake_config.h.in b/makefiles/cmake/cmake_config.h.in
-index 5f08ad5..080b8e8 100644
---- a/makefiles/cmake/cmake_config.h.in
-+++ b/makefiles/cmake/cmake_config.h.in
-@@ -8,5 +8,8 @@
- /** Do we have support for GLIBC mtrace() ? */
- #cmakedefine                    HAVE_MTRACE
-
-+/** Do we have the execinfo.h include file ? */
-+#cmakedefine                    HAVE_EXECINFO_H
-+
- #endif
-
---
-1.7.10
-
package/rpi-userland/rpi-userland.mk +1 -2
index ece37d4..522a97f 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-RPI_USERLAND_VERSION = 9852ce28826889e50c4d6786b942f51bccccac54
+RPI_USERLAND_VERSION = 5e9a740a88a889dfc8a18bb1b00c17e5dd9d0108
 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILE = LICENCE
--

1.7.2.5

#2 lore raw

PATCH 1/1 package/rpi-userland: update to fix no-longer applying patch

In reply to Yann E. MORIN
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Yann> Our patches do not apply as-is against the version of Yann> rpi-userland we package (weird...).

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/1 package/rpi-userland: update to fix no-longer applying patch

Quoted 6 lines · Floris Bos
Quoted 3 lines · Yann E. MORIN

Our patches do not apply as-is against the version of rpi-userland we package (weird...).

Quoted 7 lines

RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master

Shouldn't that be something like this?

RPI_USERLAND_SITE =
http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)

You are using the version variable only if the projects has tag, which this one hasn't.
Then, you are forced to use sha1 version, then you give the branch where this sha1 can be found.
As specified in the doc :
http://buildroot.uclibc.org/downloads/manual/manual.html#github-download-url

It appears to be correct but still seem to not work as expected.

Quoted 8 lines

Yours sincerely,

Floris Bos
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#5 lore raw

PATCH 1/1 package/rpi-userland: update to fix no-longer applying patch

Quoted 12 lines · Maxime Hadjinlian
Quoted 11 lines · Floris Bos
Quoted 2 lines · Yann E. MORIN

Our patches do not apply as-is against the version of rpi-userland we package (weird...).

RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master

Shouldn't that be something like this?

RPI_USERLAND_SITE =
http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)

Quoted 6 lines

You are using the version variable only if the projects has tag, which this one hasn't.
Then, you are forced to use sha1 version, then you give the branch where this sha1 can be found.
As specified in the doc :
http://buildroot.uclibc.org/downloads/manual/manual.html#github-download-url

Documentation is incorrect/outdated.

Github only looks at the folder name, ignores the filename, and will redirect you to
https://nodeload.github.com/raspberrypi/userland/legacy.tar.gz/master

==
--2013-02-10 15:42:21--
http://github.com/raspberrypi/userland/tarball/master/rpi-userland-9852ce28826889e50c4d6786b942f51bccccac54.tar.gz
Resolving github.com (github.com)... 207.97.227.239 Connecting to github.com (github.com)|207.97.227.239|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location:
https://github.com/raspberrypi/userland/tarball/master/rpi-userland-9852ce28826889e50c4d6786b942f51bccccac54.tar.gz
[following]
--2013-02-10 15:42:21--
https://github.com/raspberrypi/userland/tarball/master/rpi-userland-9852ce28826889e50c4d6786b942f51bccccac54.tar.gz
Connecting to github.com (github.com)|207.97.227.239|:443... connected. HTTP request sent, awaiting response... 302 Found
Location:
https://nodeload.github.com/raspberrypi/userland/legacy.tar.gz/master
[following]
--2013-02-10 15:42:21--
https://nodeload.github.com/raspberrypi/userland/legacy.tar.gz/master
==

With "RPI_USERLAND_SITE=http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)" it does work:

==
--2013-02-10 15:45:53--
http://github.com/raspberrypi/userland/tarball/9852ce28826889e50c4d6786b942f51bccccac54/rpi-userland-9852ce28826889e50c4d6786b942f51bccccac54.tar.gz
Resolving github.com (github.com)... 207.97.227.239 Connecting to github.com (github.com)|207.97.227.239|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location:
https://github.com/raspberrypi/userland/tarball/9852ce28826889e50c4d6786b942f51bccccac54/rpi-userland-9852ce28826889e50c4d6786b942f51bccccac54.tar.gz
[following]
--2013-02-10 15:45:53--
https://github.com/raspberrypi/userland/tarball/9852ce28826889e50c4d6786b942f51bccccac54/rpi-userland-9852ce28826889e50c4d6786b942f51bccccac54.tar.gz
Connecting to github.com (github.com)|207.97.227.239|:443... connected. HTTP request sent, awaiting response... 302 Found
Location:
https://nodeload.github.com/raspberrypi/userland/legacy.tar.gz/9852ce28826889e50c4d6786b942f51bccccac54
[following]
--2013-02-10 15:45:53--
https://nodeload.github.com/raspberrypi/userland/legacy.tar.gz/9852ce28826889e50c4d6786b942f51bccccac54
Resolving nodeload.github.com (nodeload.github.com)... 207.97.227.252 Connecting to nodeload.github.com (nodeload.github.com)|207.97.227.252|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 32085513 (31M) [application/x-gzip]
==

Yours sincerely,

Floris Bos

#6 lore raw

PATCH 1/1 package/rpi-userland: update to fix no-longer applying patch

Hi all,

2013/2/10 Floris Bos <[email protected]>:

Quoted 33 lines · Maxime Hadjinlian
Quoted 17 lines
Quoted 7 lines · Floris Bos
Quoted 3 lines · Yann E. MORIN

Our patches do not apply as-is against the version of rpi-userland we package (weird...).

Quoted 7 lines

RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master

Shouldn't that be something like this?

RPI_USERLAND_SITE =
http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)

Quoted 7 lines

You are using the version variable only if the projects has tag, which this one hasn't.
Then, you are forced to use sha1 version, then you give the branch where this sha1 can be found.
As specified in the doc :

http://buildroot.uclibc.org/downloads/manual/manual.html#github-download-url

Documentation is incorrect/outdated.

Github only looks at the folder name, ignores the filename, and will redirect you to
https://nodeload.github.com/raspberrypi/userland/legacy.tar.gz/master

[...]

Quoted 4 lines

With "RPI_USERLAND_SITE=http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)" it does work:

[...]

Fair enough.
Care to fix/update the doc?

Also, rpi-userland is not the only package fetched from github... So patches for all other potentially broken packages will be welcome as well.

Regards,

Signature · 1 line
Samuel
#7 lore raw

PATCH 1/1 package/rpi-userland: update to fix no-longer applying patch

Quoted 36 lines · Samuel Martin

Hi all,

2013/2/10 Floris Bos <[email protected]>:

Quoted 24 lines · Maxime Hadjinlian
Quoted 23 lines
Quoted 7 lines · Floris Bos
Quoted 3 lines · Yann E. MORIN

Our patches do not apply as-is against the version of rpi-userland we package (weird...).

Quoted 7 lines

RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master

Shouldn't that be something like this?

RPI_USERLAND_SITE =
http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)

You are using the version variable only if the projects has tag, which this one hasn't.
Then, you are forced to use sha1 version, then you give the branch where this sha1 can be found.
As specified in the doc :

Quoted 9 lines
Quoted 1 line

http://buildroot.uclibc.org/downloads/manual/manual.html#github-download-url

Documentation is incorrect/outdated.

Github only looks at the folder name, ignores the filename, and will redirect you to
https://nodeload.github.com/raspberrypi/userland/legacy.tar.gz/master

Quoted 7 lines

[...]

Quoted 4 lines

With "RPI_USERLAND_SITE=http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)" it does work:

[...]

Indeed, thanks for finding this.

Quoted 5 lines

Fair enough.
Care to fix/update the doc?

Also, rpi-userland is not the only package fetched from github... So patches for all other potentially broken packages will be welcome as well.

Yep, we should do a little grep magic here to find all the possible incorrect packages.

Quoted 9 lines

Regards,

--
Samuel
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

#8 lore raw

PATCH 1/1 package/rpi-userland: update to fix no-longer applying patch

In reply to Samuel Martin
Quoted 10 lines · Samuel Martin

Documentation is incorrect/outdated.

Github only looks at the folder name, ignores the filename, and will redirect you to
https://nodeload.github.com/raspberrypi/userland/legacy.tar.gz/master

[...]

Quoted 3 lines

With "RPI_USERLAND_SITE=http://github.com/raspberrypi/userland/tarball/$(RPI_USERLAND_VERSION)" it does work:

Quoted 7 lines

[...]

Fair enough.
Care to fix/update the doc?

Also, rpi-userland is not the only package fetched from github... So patches for all other potentially broken packages will be welcome as well.

Problem is that if they were to change their tarball URLs in the future, it would break all github packages again.
Wonder if it wouldn't be a better long term solution to have some kind of abstraction for github (and perhaps sourceforge) packages.

E.g. specify "FOO_SITE=github://foopackage" in the package's makefile, and add a special DOWNLOAD_GITHUB helper routine in pkg-download.mk So we would only need to update pkg-download.mk if it were to change again.

Yours sincerely,

Floris Bos