Skip to contentSkip to conversation

More autobuilder fixes

PATCH New Samuel Martin 2 participants 6 messages Feb 9, 2014

lore
Share & tools
lore
#0 lore raw

cover More autobuilder fixes

All,

Another series fixing autobuilder failures. ;-)

Yours,
Samuel

Samuel Martin (4):
kexec: rename patch to add sequence number
kexec: fix build failure
vlc: fix glx support
vlc: fix typo when setting VLC_CONF_ENV

 ...-largefile.patch => kexec-0001-largefile.patch} |  0
 ...ix-build-failure-bzImage_support_efi_boot.patch | 28 ++++++++++++++++++++++
 package/vlc/vlc.mk                                 |  9 ++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)
 rename package/kexec/{kexec-largefile.patch => kexec-0001-largefile.patch} (100%)
 create mode 100644 package/kexec/kexec-0002-i386-fix-build-failure-bzImage_support_efi_boot.patch

--
1.8.5.4

#1 lore raw

PATCH 1/4 kexec: rename patch to add sequence number

---
 package/kexec/{kexec-largefile.patch => kexec-0001-largefile.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/kexec/{kexec-largefile.patch => kexec-0001-largefile.patch} (100%)
package/kexec/kexec-0001-largefile.patch renamed from package/kexec/kexec-largefile.patch +0 -0
similarity index 100%
rename from package/kexec/kexec-largefile.patch
rename to package/kexec/kexec-0001-largefile.patch
Signature · 1 line
1.8.5.4
#2 lore raw

PATCH 2/4 kexec: fix build failure

In reply to Samuel Martin

Add patch retrived from upstream and fixing undefined bzImage_support_efi_boot build failure.

Fixes:
http://autobuild.buildroot.org/results/c35/c3525dd25a37db7a976c7019901160e449363b5d/build-end.log

---
 ...ix-build-failure-bzImage_support_efi_boot.patch | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/kexec/kexec-0002-i386-fix-build-failure-bzImage_support_efi_boot.patch
package/kexec/kexec-0002-i386-fix-build-failure-bzImage_support_efi_boot.patch new file +28 -0
new file mode 100644
index 0000000..3572015
@@ -0,0 +1,28 @@
+Fetch from:
+  https://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/patch/?id=9bcefc97bc6c03b6acc8c25f6b1d4e796521ea4c
+
+From 9bcefc97bc6c03b6acc8c25f6b1d4e796521ea4c Mon Sep 17 00:00:00 2001
+From: Tony Jones <[email protected]>
+Date: Wed, 05 Feb 2014 22:32:18 +0000
+Subject: i386: fix build failure (bzImage_support_efi_boot)
+
+Commit 9c200a85de2245a850546fded96a1977b84ad24d referenced
+'bzImage_support_efi_boot' without matching 32-bit definition.
+
+Signed-off-by: Tony Jones <[email protected]>
+Signed-off-by: Simon Horman <[email protected]>
+---
+diff --git a/kexec/arch/i386/kexec-bzImage.c b/kexec/arch/i386/kexec-bzImage.c
+index fc1a54f..e7bc1d6 100644
+--- a/kexec/arch/i386/kexec-bzImage.c
++++ b/kexec/arch/i386/kexec-bzImage.c
+@@ -40,6 +40,7 @@
+ #include <arch/options.h>
+
+ static const int probe_debug = 0;
++int bzImage_support_efi_boot = 0;
+
+ int bzImage_probe(const char *buf, off_t len)
+ {
+--
+cgit v0.9.2
Signature · 1 line
1.8.5.4
#3 lore raw

PATCH 3/4 vlc: fix glx support

In reply to Samuel Martin

glx support is provided by the mesa3d package; so, enable it only when mesa3d is part of the package selection.

Fixes:
http://autobuild.buildroot.org/results/9b4/9b46021ea0064850ce8f1adcb5455d6da5bff459/build-end.log

---
 package/vlc/vlc.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/vlc/vlc.mk +7 -0
index 2730f07..fd49040 100644
@@ -101,6 +101,13 @@ else
 VLC_CONF_OPT += --disable-flac
 endif
 
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+VLC_CONF_OPT += --enable-glx
+VLC_DEPENDENCIES += mesa3d
+else
+VLC_CONF_OPT += --disable-glx
+endif
+
 ifeq ($(BR2_PACKAGE_OPUS),y)
 VLC_CONF_OPT += --enable-opus
 VLC_DEPENDENCIES += opus
Signature · 1 line
1.8.5.4
#4 lore raw

PATCH 4/4 vlc: fix typo when setting VLC_CONF_ENV

In reply to Samuel Martin

Fixes:
http://autobuild.buildroot.org/results/917/917c26656557d50f869639162ec7e9d0f3399824/build-end.log

---
 package/vlc/vlc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/vlc/vlc.mk +1 -1
index fd49040..f235ff8 100644
@@ -211,7 +211,7 @@ endif
 ifeq ($(BR2_PACKAGE_LIVE555),y)
 VLC_CONF_OPT += --enable-live555
 VLC_DEPENDENCIES += live555
-VLC_CONF_ENV = \
+VLC_CONF_ENV += \
 	LIVE555_CFLAGS="\
 		-I$(STAGING_DIR)/usr/include/live \
 		-I$(STAGING_DIR)/usr/include/live/BasicUsageEnvironment \
Signature · 1 line
1.8.5.4
#5 lore raw

cover More autobuilder fixes

In reply to Samuel Martin
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Samuel" == Samuel Martin <[email protected]> writes:

All,
Another series fixing autobuilder failures. ;-)

Quoted 8 lines

Yours,
Samuel

Samuel Martin (4):
kexec: rename patch to add sequence number
kexec: fix build failure
vlc: fix glx support
vlc: fix typo when setting VLC_CONF_ENV

Committed series, thanks!

Signature · 1 line
Bye, Peter Korsgaard