Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
Pascal Vizeli
@@ -1,109 +0,0 @@
|
||||
From ce661985c098635965573aac8fc983a72f60d396 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Tue, 30 May 2017 16:42:34 +0200
|
||||
Subject: [PATCH] buildroot-libtool-v1.5.patch
|
||||
|
||||
Apply buildroot-libtool-v1.5.patch rebased on libtool 1.5.2 used
|
||||
in madplay and fixing all conflicts.
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
ltmain.sh | 40 ++++++++++++++++++++++++++++++----------
|
||||
1 file changed, 30 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/ltmain.sh b/ltmain.sh
|
||||
index 4b9f940..0b71220 100644
|
||||
--- a/ltmain.sh
|
||||
+++ b/ltmain.sh
|
||||
@@ -164,6 +164,11 @@ do
|
||||
arg="$1"
|
||||
shift
|
||||
|
||||
+ # Make -static behave as -all-static
|
||||
+ case $arg in
|
||||
+ -static) arg="-all-static" ;;
|
||||
+ esac
|
||||
+
|
||||
case $arg in
|
||||
-*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
|
||||
*) optarg= ;;
|
||||
@@ -549,8 +554,9 @@ if test -z "$show_help"; then
|
||||
# line option must be used.
|
||||
if test -z "$tagname"; then
|
||||
$echo "$modename: unable to infer tagged configuration"
|
||||
- $echo "$modename: specify a tag with \`--tag'" 1>&2
|
||||
- exit 1
|
||||
+ $echo "$modename: defaulting to \`CC'"
|
||||
+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
|
||||
+# exit 1
|
||||
# else
|
||||
# $echo "$modename: using $tagname tagged configuration"
|
||||
fi
|
||||
@@ -1228,7 +1234,8 @@ EOF
|
||||
prevarg="$arg"
|
||||
|
||||
case $arg in
|
||||
- -all-static)
|
||||
+ # Make -static behave like -all-static
|
||||
+ -all-static | -static)
|
||||
if test -n "$link_static_flag"; then
|
||||
compile_command="$compile_command $link_static_flag"
|
||||
finalize_command="$finalize_command $link_static_flag"
|
||||
@@ -2135,8 +2142,14 @@ EOF
|
||||
absdir="$abs_ladir"
|
||||
libdir="$abs_ladir"
|
||||
else
|
||||
- dir="$libdir"
|
||||
- absdir="$libdir"
|
||||
+ # Adding 'libdir' from the .la file to our library search paths
|
||||
+ # breaks crosscompilation horribly. We cheat here and don't add
|
||||
+ # it, instead adding the path where we found the .la. -CL
|
||||
+ dir="$abs_ladir"
|
||||
+ absdir="$abs_ladir"
|
||||
+ libdir="$abs_ladir"
|
||||
+ #dir="$libdir"
|
||||
+ #absdir="$libdir"
|
||||
fi
|
||||
else
|
||||
dir="$ladir/$objdir"
|
||||
@@ -2261,7 +2274,7 @@ EOF
|
||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
if test "$installed" = no; then
|
||||
notinst_deplibs="$notinst_deplibs $lib"
|
||||
- need_relink=yes
|
||||
+ need_relink=no
|
||||
fi
|
||||
# This is a shared library
|
||||
|
||||
@@ -5146,6 +5159,10 @@ fi\
|
||||
# Replace all uninstalled libtool libraries with the installed ones
|
||||
newdependency_libs=
|
||||
for deplib in $dependency_libs; do
|
||||
+ # Replacing uninstalled with installed can easily break crosscompilation,
|
||||
+ # since the installed path is generally the wrong architecture. -CL
|
||||
+ newdependency_libs="$newdependency_libs $deplib"
|
||||
+ continue
|
||||
case $deplib in
|
||||
*.la)
|
||||
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
|
||||
@@ -5464,10 +5481,13 @@ relink_command=\"$relink_command\""
|
||||
# At present, this check doesn't affect windows .dll's that
|
||||
# are installed into $libdir/../bin (currently, that works fine)
|
||||
# but it's something to keep an eye on.
|
||||
- if test "$inst_prefix_dir" = "$destdir"; then
|
||||
- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
||||
- exit 1
|
||||
- fi
|
||||
+ #
|
||||
+ # This breaks install into our staging area. -PB
|
||||
+ #
|
||||
+ # if test "$inst_prefix_dir" = "$destdir"; then
|
||||
+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
||||
+ # exit 1
|
||||
+ # fi
|
||||
|
||||
if test -n "$inst_prefix_dir"; then
|
||||
# Stick the inst_prefix_dir data into the link command.
|
||||
--
|
||||
2.9.4
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
configure.ac: don't require GNU-specific files when running automake
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
|
||||
diff -durN madplay-0.15.2b-orig/configure.ac madplay-0.15.2b/configure.ac
|
||||
--- madplay-0.15.2b-orig/configure.ac 2019-02-14 21:34:01.507212449 +0100
|
||||
+++ madplay-0.15.2b/configure.ac 2019-02-14 21:34:23.439336353 +0100
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
AC_CONFIG_SRCDIR([madplay.c])
|
||||
|
||||
-AM_INIT_AUTOMAKE
|
||||
+AM_INIT_AUTOMAKE([foreign])
|
||||
|
||||
AM_CONFIG_HEADER([config.h])
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
configure.ac: use pkg-config to find id3tag
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
|
||||
diff -durN madplay-0.15.2b-orig/configure.ac madplay-0.15.2b/configure.ac
|
||||
--- madplay-0.15.2b-orig/configure.ac 2019-02-14 21:34:01.507212449 +0100
|
||||
+++ madplay-0.15.2b/configure.ac 2019-02-15 23:24:00.079876087 +0100
|
||||
@@ -182,12 +182,13 @@
|
||||
*** environment variable to specify its installed location, e.g. -L<dir>.])
|
||||
])
|
||||
|
||||
-AC_CHECK_LIB(id3tag, id3_tag_parse, :, [
|
||||
+PKG_CHECK_MODULES(ID3TAG, id3tag, [
|
||||
+ CFLAGS="$CFLAGS $ID3TAG_CFLAGS" LIBS="$LIBS $ID3TAG_LIBS"], [
|
||||
AC_MSG_ERROR([libid3tag was not found
|
||||
*** You must first install libid3tag before you can build this package.
|
||||
*** If libid3tag is already installed, you may need to use the LDFLAGS
|
||||
*** environment variable to specify its installed location, e.g. -L<dir>.])
|
||||
-], [-lz])
|
||||
+])
|
||||
|
||||
AC_FUNC_VPRINTF
|
||||
AC_CHECK_FUNCS(madvise localeconv)
|
||||
@@ -0,0 +1,23 @@
|
||||
configure.ac: call AM_MKINSTALLDIRS to substitute @MKINSTALLDIRS@
|
||||
|
||||
MKINSTALLDIRS is obsolete and doesn't get automatically called.
|
||||
|
||||
Force call AM_MKINSTALLDIRS() macro to substitute every @MKINSTALLDIRS@
|
||||
occurence in *.in files.
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
|
||||
diff -urpN madplay-0.15.2b.orig/configure.ac madplay-0.15.2b/configure.ac
|
||||
--- madplay-0.15.2b.orig/configure.ac 2019-04-16 12:06:03.781018755 +0200
|
||||
+++ madplay-0.15.2b/configure.ac 2019-04-16 12:07:48.399162610 +0200
|
||||
@@ -146,6 +146,10 @@ ALL_LINGUAS="en es fr hr no"
|
||||
AM_GNU_GETTEXT([use-libtool])
|
||||
AM_GNU_GETTEXT_VERSION(0.14.1)
|
||||
|
||||
+dnl Substitute MKINSTALLDIRS
|
||||
+
|
||||
+AM_MKINSTALLDIRS()
|
||||
+
|
||||
dnl Checks for header files.
|
||||
|
||||
AC_HEADER_STDC
|
||||
@@ -6,8 +6,8 @@ config BR2_PACKAGE_MADPLAY
|
||||
Command-line front-end to libmad, a high-quality MPEG audio
|
||||
decoder. It currently supports MPEG-1 and the MPEG-2
|
||||
extension to lower sampling frequencies, as well as the de
|
||||
facto MPEG 2.5 format. All three audio layers — Layer I,
|
||||
Layer II, and Layer III (i.e. MP3) — are fully implemented.
|
||||
facto MPEG 2.5 format. All three audio layers - Layer I,
|
||||
Layer II, and Layer III (i.e. MP3) - are fully implemented.
|
||||
|
||||
http://www.underbit.com/products/mad/
|
||||
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# Locally computed:
|
||||
sha256 5a79c7516ff7560dffc6a14399a389432bc619c905b13d3b73da22fa65acede0 madplay-0.15.2b.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
sha256 915bfd70548f31d11f9b4ffb21f343d1196af96c79d6aaac5663ea46c39dd3a3 COPYRIGHT
|
||||
|
||||
@@ -8,14 +8,18 @@ MADPLAY_VERSION = 0.15.2b
|
||||
MADPLAY_SITE = http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION)
|
||||
MADPLAY_LICENSE = GPL-2.0+
|
||||
MADPLAY_LICENSE_FILES = COPYING COPYRIGHT
|
||||
MADPLAY_LIBTOOL_PATCH = NO
|
||||
MADPLAY_DEPENDENCIES = libmad libid3tag $(TARGET_NLS_DEPENDENCIES)
|
||||
MADPLAY_DEPENDENCIES = host-pkgconf libmad libid3tag $(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
# Force autoreconf to be able to use a more recent libtool script, that
|
||||
# is able to properly behave in the face of a missing C++ compiler.
|
||||
# Also 0003-configure-ac-use-pkg-config-to-find-id3tag.patch
|
||||
MADPLAY_AUTORECONF = YES
|
||||
|
||||
# Check if ALSA is built, then we should configure after alsa-lib so
|
||||
# ./configure can find alsa-lib.
|
||||
ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y)
|
||||
MADPLAY_CONF_OPTS += --with-alsa
|
||||
MADPLAY_DEPENDENCIES += host-pkgconf alsa-lib
|
||||
MADPLAY_DEPENDENCIES += alsa-lib
|
||||
MADPLAY_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs alsa`"
|
||||
endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user