* [PATCH 25/25] packagegroup: Do not add libssp to SDK @ 2018-04-30 14:14 Khem Raj 2018-04-30 14:14 ` [PATCH V2 08/25] alsa-tools: Update to 1.1.6 Khem Raj 2018-04-30 14:14 ` [PATCH V2 10/25] ruby: Upgrade to 2.5.1 Khem Raj 0 siblings, 2 replies; 4+ messages in thread From: Khem Raj @ 2018-04-30 14:14 UTC (permalink / raw) To: openembedded-core Libssp is only needed on mon-glibc/non-musl systems Add rpcsvc-proto for rpcgen since its not part of glibc anymore Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../packagegroup-core-standalone-sdk-target.bb | 2 +- .../packagegroups/packagegroup-self-hosted.bb | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb index 43fc599c73..f5b2d69cef 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb @@ -13,7 +13,7 @@ RDEPENDS_${PN} = "\ ${LIBC_DEPENDENCIES} \ " -RRECOMMENDS_${PN} = "\ +RRECOMMENDS_${PN}_mingw32 = "\ libssp \ libssp-dev \ " diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index adb0c56c3a..f1273e8a17 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -76,9 +76,6 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ intltool \ ldd \ less \ - libssp \ - libssp-dev \ - libssp-staticdev \ libstdc++ \ libstdc++-dev \ libtool \ @@ -90,10 +87,16 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ quilt \ sed \ " -# glibc-utils: for rpcgen +RDEPENDS_packagegroup-self-hosted-sdk_append_mingw32 = "\ + libssp \ + libssp-dev \ + libssp-staticdev \ + " +# rpcsvc-proto: for rpcgen RDEPENDS_packagegroup-self-hosted-sdk_append_libc-glibc = "\ glibc-gconv-ibm850 \ glibc-utils \ + rpcsvc-proto \ " RDEPENDS_packagegroup-self-hosted-debug = " \ gdb \ -- 2.17.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH V2 08/25] alsa-tools: Update to 1.1.6 2018-04-30 14:14 [PATCH 25/25] packagegroup: Do not add libssp to SDK Khem Raj @ 2018-04-30 14:14 ` Khem Raj 2018-04-30 14:14 ` [PATCH V2 10/25] ruby: Upgrade to 2.5.1 Khem Raj 1 sibling, 0 replies; 4+ messages in thread From: Khem Raj @ 2018-04-30 14:14 UTC (permalink / raw) To: openembedded-core License-Update: FSF address updated in hdsploader/COPYING and ld10k1/COPYING.LIB Fix built with clang along the way Package python dependent tools into a separate package Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...served-user-defined-literal-warnings.patch | 28 +++++++++++++ .../alsa/alsa-tools/autotools.patch | 42 ++++++++++++------- ...lsa-tools_1.1.5.bb => alsa-tools_1.1.6.bb} | 25 ++++++++--- 3 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch rename meta/recipes-multimedia/alsa/{alsa-tools_1.1.5.bb => alsa-tools_1.1.6.bb} (62%) diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch b/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch new file mode 100644 index 0000000000..2290915eab --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools/0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch @@ -0,0 +1,28 @@ +From 2e48e4045e1e951433da0ca4b1e49798eedde14f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 24 Apr 2018 12:21:18 -0700 +Subject: [PATCH] Fix clang -Wreserved-user-defined-literal warnings + +| us428control.cc:66:18: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] +| printf("usage: "PROGNAME" [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); +| ^ + +Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10360805/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + us428control/us428control.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/us428control/us428control.cc b/us428control/us428control.cc +index e839bf4..8cb3c42 100644 +--- a/us428control/us428control.cc ++++ b/us428control/us428control.cc +@@ -63,7 +63,7 @@ static void usage(void) + { + printf("Tascam US-428 Control\n"); + printf("version %s\n", VERSION); +- printf("usage: "PROGNAME" [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); ++ printf("usage: " PROGNAME " [-v verbosity_level 0..2] [-c card] [-D device] [-u usb-device] [-m mode]\n"); + printf("mode is one of (us224, us428, mixxx)\n"); + } + /* diff --git a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch index 2e74963c89..c85834a593 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch +++ b/meta/recipes-multimedia/alsa/alsa-tools/autotools.patch @@ -1,3 +1,8 @@ +From b9a65bf3ba5628cfe8cfd2d10ce2dcf11a606775 Mon Sep 17 00:00:00 2001 +From: Dongxiao Xu <dongxiao.xu@intel.com> +Date: Thu, 14 Jul 2011 15:40:36 +0800 +Subject: [PATCH] alsa-tools: Fix recipe build error. + Add parameters to autoreconf to support cross compile. Remove some sub-components which needs further recipe support. @@ -5,22 +10,17 @@ Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Upstream-Status: Inappropriate [configuration] -diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile ---- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile 2011-07-06 11:27:40.227665002 +0800 -+++ alsa-tools-1.0.24.1/ld10k1/gitcompile 2011-07-14 13:26:18.017665004 +0800 -@@ -1,6 +1,6 @@ - #!/bin/bash - --autoreconf -fi || exit 1 -+autoreconf $ACLOCAL_FLAGS -fi || exit 1 - export CFLAGS='-O2 -Wall -pipe -g' - echo "CFLAGS=$CFLAGS" - echo "./configure $@" -diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile ---- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800 -+++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800 +--- + Makefile | 4 ++-- + ld10k1/gitcompile | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index c32bf25..1119372 100644 +--- a/Makefile ++++ b/Makefile @@ -1,8 +1,8 @@ - VERSION = 1.1.5 + VERSION = 1.1.6 TOP = . -SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \ +SUBDIRS = as10k1 envy24control \ @@ -30,3 +30,15 @@ diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile hwmixvolume hdajackretask hda-verb hdajacksensetest all: +diff --git a/ld10k1/gitcompile b/ld10k1/gitcompile +index 99429ac..20005d9 100755 +--- a/ld10k1/gitcompile ++++ b/ld10k1/gitcompile +@@ -1,6 +1,6 @@ + #!/bin/bash + +-autoreconf -fi || exit 1 ++autoreconf $ACLOCAL_FLAGS -fi || exit 1 + export CFLAGS='-O2 -Wall -pipe -g' + echo "CFLAGS=$CFLAGS" + echo "./configure $@" diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb similarity index 62% rename from meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb rename to meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb index 1be43aa6e7..e065eec6b8 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.1.5.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.1.6.bb @@ -5,17 +5,19 @@ SECTION = "console/utils" LICENSE = "GPLv2 & LGPLv2+" DEPENDS = "alsa-lib ncurses glib-2.0" -LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://ld10k1/COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" +LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://ld10k1/COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7 \ + " SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ file://autotools.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)} \ file://gitcompile_hdajacksensetest \ + file://0002-Fix-clang-Wreserved-user-defined-literal-warnings.patch \ " -SRC_URI[md5sum] = "3afb92eb1b4f2edc8691498e57c3ec78" -SRC_URI[sha256sum] = "bc3c6567de835223ee7d69487b8c22fb395a2e8c613341b0c96e6a5f6a2bd534" +SRC_URI[md5sum] = "5ca8c9437ae779997cd62fb2815fef19" +SRC_URI[sha256sum] = "d69c4dc2fb641a974d9903e9eb78c94cb0c7ac6c45bae664f0c9d6c0a1593227" inherit autotools-brokensep pkgconfig @@ -37,4 +39,17 @@ do_compile_prepend () { cp ${WORKDIR}/gitcompile_hdajacksensetest ${S}/hdajacksensetest/gitcompile } -FILES_${PN} += "${datadir}/ld10k1" +do_install_append() { + sed -i -e "s|/usr/bin/python2|/usr/bin/env python2|g" ${D}${bindir}/hwmixvolume +} + +PACKAGES =+ "${PN}-hwmixvolume" + +FILES_${PN}-hwmixvolume = "${bindir}/hwmixvolume" + +FILES_${PN} += "${datadir}/ld10k1 \ + ${datadir}/icons/hicolor \ + " + +RDEPENDS_${PN}-hwmixvolume += "python" + -- 2.17.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH V2 10/25] ruby: Upgrade to 2.5.1 2018-04-30 14:14 [PATCH 25/25] packagegroup: Do not add libssp to SDK Khem Raj 2018-04-30 14:14 ` [PATCH V2 08/25] alsa-tools: Update to 1.1.6 Khem Raj @ 2018-04-30 14:14 ` Khem Raj 2018-05-02 15:37 ` Randy MacLeod 1 sibling, 1 reply; 4+ messages in thread From: Khem Raj @ 2018-04-30 14:14 UTC (permalink / raw) To: openembedded-core License Update: https://github.com/ruby/ruby/commit/322d0d93adfe42fc89c574f67bcb9acb9b82f251#diff-c53151ffd180a17416e8f09b1ca4bfc3 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/ruby/ruby.inc | 11 +++++------ .../ruby/{ruby_2.5.0.bb => ruby_2.5.1.bb} | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) rename meta/recipes-devtools/ruby/{ruby_2.5.0.bb => ruby_2.5.1.bb} (90%) diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc index fd3911ba75..a366e93f66 100644 --- a/meta/recipes-devtools/ruby/ruby.inc +++ b/meta/recipes-devtools/ruby/ruby.inc @@ -7,12 +7,11 @@ It is simple, straight-forward, and extensible. \ HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" LICENSE = "Ruby | BSD | GPLv2" -LIC_FILES_CHKSUM = "\ - file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ - file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ - file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ - file://LEGAL;md5=8f871f3f03732c018a5fa9b185958231 \ -" +LIC_FILES_CHKSUM = "file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ + file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5 \ + file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LEGAL;md5=23a79bb4c1a40f6cc9bcb6f4e7c39799 \ + " DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline" DEPENDS_class-native = "openssl-native libyaml-native" diff --git a/meta/recipes-devtools/ruby/ruby_2.5.0.bb b/meta/recipes-devtools/ruby/ruby_2.5.1.bb similarity index 90% rename from meta/recipes-devtools/ruby/ruby_2.5.0.bb rename to meta/recipes-devtools/ruby/ruby_2.5.1.bb index 1ac7f2aa5a..91048284c1 100644 --- a/meta/recipes-devtools/ruby/ruby_2.5.0.bb +++ b/meta/recipes-devtools/ruby/ruby_2.5.1.bb @@ -5,8 +5,8 @@ SRC_URI += " \ file://ruby-CVE-2017-9228.patch \ " -SRC_URI[md5sum] = "f4711f856fe14de222b9da3d3b8efa89" -SRC_URI[sha256sum] = "46e6f3630f1888eb653b15fa811d77b5b1df6fd7a3af436b343cfe4f4503f2ab" +SRC_URI[md5sum] = "23867bc8c16c55e43b14dfe0614bcfa8" +SRC_URI[sha256sum] = "dac81822325b79c3ba9532b048c2123357d3310b2b40024202f360251d9829b1" # it's unknown to configure script, but then passed to extconf.rb # maybe it's not really needed as we're hardcoding the result with -- 2.17.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V2 10/25] ruby: Upgrade to 2.5.1 2018-04-30 14:14 ` [PATCH V2 10/25] ruby: Upgrade to 2.5.1 Khem Raj @ 2018-05-02 15:37 ` Randy MacLeod 0 siblings, 0 replies; 4+ messages in thread From: Randy MacLeod @ 2018-05-02 15:37 UTC (permalink / raw) To: Khem Raj, openembedded-core On 2018-04-30 10:14 AM, Khem Raj wrote: > License Update: https://github.com/ruby/ruby/commit/322d0d93adfe42fc89c574f67bcb9acb9b82f251#diff-c53151ffd180a17416e8f09b1ca4bfc3 > Could you summarize the license changes in the long log: License changes due to: * Update redirected and upstream url. * Added the Wayback Machine url for missing link. so people don't have to switch out of a terminal for example. Also, will github ever really go away, who knows! :) ../Randy > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > meta/recipes-devtools/ruby/ruby.inc | 11 +++++------ > .../ruby/{ruby_2.5.0.bb => ruby_2.5.1.bb} | 4 ++-- > 2 files changed, 7 insertions(+), 8 deletions(-) > rename meta/recipes-devtools/ruby/{ruby_2.5.0.bb => ruby_2.5.1.bb} (90%) > > diff --git a/meta/recipes-devtools/ruby/ruby.inc b/meta/recipes-devtools/ruby/ruby.inc > index fd3911ba75..a366e93f66 100644 > --- a/meta/recipes-devtools/ruby/ruby.inc > +++ b/meta/recipes-devtools/ruby/ruby.inc > @@ -7,12 +7,11 @@ It is simple, straight-forward, and extensible. \ > HOMEPAGE = "http://www.ruby-lang.org/" > SECTION = "devel/ruby" > LICENSE = "Ruby | BSD | GPLv2" > -LIC_FILES_CHKSUM = "\ > - file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ > - file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\ > - file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\ > - file://LEGAL;md5=8f871f3f03732c018a5fa9b185958231 \ > -" > +LIC_FILES_CHKSUM = "file://COPYING;md5=340948e1882e579731841bf49cdc22c1 \ > + file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5 \ > + file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > + file://LEGAL;md5=23a79bb4c1a40f6cc9bcb6f4e7c39799 \ > + " > > DEPENDS = "ruby-native zlib openssl tcl libyaml gdbm readline" > DEPENDS_class-native = "openssl-native libyaml-native" > diff --git a/meta/recipes-devtools/ruby/ruby_2.5.0.bb b/meta/recipes-devtools/ruby/ruby_2.5.1.bb > similarity index 90% > rename from meta/recipes-devtools/ruby/ruby_2.5.0.bb > rename to meta/recipes-devtools/ruby/ruby_2.5.1.bb > index 1ac7f2aa5a..91048284c1 100644 > --- a/meta/recipes-devtools/ruby/ruby_2.5.0.bb > +++ b/meta/recipes-devtools/ruby/ruby_2.5.1.bb > @@ -5,8 +5,8 @@ SRC_URI += " \ > file://ruby-CVE-2017-9228.patch \ > " > > -SRC_URI[md5sum] = "f4711f856fe14de222b9da3d3b8efa89" > -SRC_URI[sha256sum] = "46e6f3630f1888eb653b15fa811d77b5b1df6fd7a3af436b343cfe4f4503f2ab" > +SRC_URI[md5sum] = "23867bc8c16c55e43b14dfe0614bcfa8" > +SRC_URI[sha256sum] = "dac81822325b79c3ba9532b048c2123357d3310b2b40024202f360251d9829b1" > > # it's unknown to configure script, but then passed to extconf.rb > # maybe it's not really needed as we're hardcoding the result with > -- # Randy MacLeod # Wind River Linux ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-05-02 15:38 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-04-30 14:14 [PATCH 25/25] packagegroup: Do not add libssp to SDK Khem Raj 2018-04-30 14:14 ` [PATCH V2 08/25] alsa-tools: Update to 1.1.6 Khem Raj 2018-04-30 14:14 ` [PATCH V2 10/25] ruby: Upgrade to 2.5.1 Khem Raj 2018-05-02 15:37 ` Randy MacLeod
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox