diff options
19 files changed, 22 insertions, 550 deletions
diff --git a/meta-sokol-flex-common/conf/layer.conf b/meta-sokol-flex-common/conf/layer.conf index 08d1f255..19edbddb 100644 --- a/meta-sokol-flex-common/conf/layer.conf +++ b/meta-sokol-flex-common/conf/layer.conf @@ -8,4 +8,4 @@ BBFILE_COLLECTIONS += "sokol-flex-common" BBFILE_PATTERN_sokol-flex-common = "^${LAYERDIR}/" BBFILE_PATTERN_IGNORE_EMPTY_sokol-flex-common = "1" BBFILE_PRIORITY_sokol-flex-common = "1" -LAYERSERIES_COMPAT_sokol-flex-common = "kirkstone" +LAYERSERIES_COMPAT_sokol-flex-common = "langdale" diff --git a/meta-sokol-flex-distro/conf/distro/sokol-flex.conf b/meta-sokol-flex-distro/conf/distro/sokol-flex.conf index b7d8cfbd..bfd32588 100644 --- a/meta-sokol-flex-distro/conf/distro/sokol-flex.conf +++ b/meta-sokol-flex-distro/conf/distro/sokol-flex.conf @@ -7,7 +7,7 @@ require conf/distro/include/vendor.inc ## }}}1 ## Sokol Flex OS Base Configuration {{{1 DISTRO_NAME = "Sokol Flex OS" -DISTRO_CODENAME = "kirkstone" +DISTRO_CODENAME = "langdale" MAINTAINER = "Siemens Digital Industries Software <embedded_support@mentor.com>" HOME_URL = "https://www.plm.automation.siemens.com/global/en/products/embedded/flex-os.html" SUPPORT_URL = "https://support.sw.siemens.com/" diff --git a/meta-sokol-flex-distro/conf/layer.conf b/meta-sokol-flex-distro/conf/layer.conf index 68214df9..a30e553e 100644 --- a/meta-sokol-flex-distro/conf/layer.conf +++ b/meta-sokol-flex-distro/conf/layer.conf @@ -18,7 +18,7 @@ BBFILES_DYNAMIC += "${@' '.join( \ BBFILE_COLLECTIONS += "sokol-flex-distro" BBFILE_PRIORITY_sokol-flex-distro = "12" BBFILE_PATTERN_sokol-flex-distro = "^${LAYERDIR_RE}/" -LAYERSERIES_COMPAT_sokol-flex-distro = "kirkstone" +LAYERSERIES_COMPAT_sokol-flex-distro = "langdale" LAYERDEPENDS_sokol-flex-distro = "core sokol-flex-common" LAYERRECOMMENDS_sokol-flex-distro = "sokol-flex-support sokol-flex-staging sourcery flex-private flex-cve" LAYERRECOMMENDS_sokol-flex-distro += "openembedded-layer filesystems-layer networking-layer multimedia-layer" diff --git a/meta-sokol-flex-distro/dynamic-layers/openembedded-layer/recipes-connectivity/libwebsockets/libwebsockets_4.2.2.bbappend b/meta-sokol-flex-distro/dynamic-layers/openembedded-layer/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bbappend index ce45ab63..4a18df30 100644 --- a/meta-sokol-flex-distro/dynamic-layers/openembedded-layer/recipes-connectivity/libwebsockets/libwebsockets_4.2.2.bbappend +++ b/meta-sokol-flex-distro/dynamic-layers/openembedded-layer/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bbappend @@ -1,4 +1,4 @@ -SRCREV:sokol-flex = "7e4482075d30bd276c66b9f8daa1f9b8871c8743" -SRC_URI:sokol-flex = "git://github.com/MentorEmbedded/libwebsockets.git;protocol=https;branch=v4.2-stable" +SRCREV:sokol-flex = "6665a80979e6e364547b4862dc8d8e69a862a7de" +SRC_URI:sokol-flex = "git://github.com/MentorEmbedded/libwebsockets.git;protocol=https;branch=v4.3-stable" EXTRA_OECMAKE += "-DLWS_WITHOUT_TESTAPPS=ON" diff --git a/meta-sokol-flex-distro/recipes-core/kbd/kbd_2.4.0.bbappend b/meta-sokol-flex-distro/recipes-core/kbd/kbd_2.4.0.bbappend deleted file mode 100644 index 0f850bc0..00000000 --- a/meta-sokol-flex-distro/recipes-core/kbd/kbd_2.4.0.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -# --------------------------------------------------------------------------------------------------------------------- -# SPDX-License-Identifier: MIT -# --------------------------------------------------------------------------------------------------------------------- - -SRC_URI:prepend:sokol-flex = "git://github.com/MentorEmbedded/kbd;branch=2.4;protocol=https " -SRC_URI:remove:sokol-flex := "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz" -SRCREV:sokol-flex = "a95b34e0f4c78be7e3c137613b3d8c161ab322ba" -S:sokol-flex = "${WORKDIR}/git" - -DEPENDS:append:sokol-flex = " bison-native" - -# Don't exclude autopoint -EXTRA_AUTORECONF:sokol-flex = "" diff --git a/meta-sokol-flex-distro/recipes-core/kbd/kbd_2.5.1.bbappend b/meta-sokol-flex-distro/recipes-core/kbd/kbd_2.5.1.bbappend new file mode 100644 index 00000000..7ec3624a --- /dev/null +++ b/meta-sokol-flex-distro/recipes-core/kbd/kbd_2.5.1.bbappend @@ -0,0 +1,13 @@ +# --------------------------------------------------------------------------------------------------------------------- +# SPDX-License-Identifier: MIT +# --------------------------------------------------------------------------------------------------------------------- + +SRC_URI:prepend:mel = "git://github.com/MentorEmbedded/kbd;branch=2.5;protocol=https " +SRC_URI:remove:mel := "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz" +SRCREV:mel = "76a726463757933231cbf1df54f54181e9080edc" +S:mel = "${WORKDIR}/git" + +DEPENDS:append:mel = " bison-native" + +# Don't exclude autopoint +EXTRA_AUTORECONF:mel = "" diff --git a/meta-sokol-flex-staging/conf/layer.conf b/meta-sokol-flex-staging/conf/layer.conf index 2e559c0d..af0a4ebf 100644 --- a/meta-sokol-flex-staging/conf/layer.conf +++ b/meta-sokol-flex-staging/conf/layer.conf @@ -20,7 +20,7 @@ BBFILE_COLLECTIONS += "sokol-flex-staging" BBFILE_PRIORITY_sokol-flex-staging = "10" BBFILE_PATTERN_sokol-flex-staging = "^${LAYERDIR_RE}/" LAYERDEPENDS_sokol-flex-staging = "core sokol-flex-common" -LAYERSERIES_COMPAT_sokol-flex-staging = "kirkstone" +LAYERSERIES_COMPAT_sokol-flex-staging = "langdale" # We don't want systemd and everything depending on systemd to rebuild when # the metadata stored in os-release changes. TODO: push this to oe-core diff --git a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0001-If-we-re-cross-compiling-tell-the-user-to-run-mkroun.patch b/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0001-If-we-re-cross-compiling-tell-the-user-to-run-mkroun.patch deleted file mode 100644 index 1542f193..00000000 --- a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0001-If-we-re-cross-compiling-tell-the-user-to-run-mkroun.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 32da44bde46b8b78b25d37a172e7a57257ca5b8b Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayned@samba.org> -Date: Tue, 1 Jan 2008 08:59:26 -0800 -Subject: [PATCH 1/4] If we're cross-compiling, tell the user to run - mkrounding on the target machine to build the - rounding.h file. (cherry picked from commit - f859d3ded6285c499898540ca4fb16f1e1a7d26b) - -Conflicts: - - NEWS - configure.in ---- - Makefile.in | 9 ++++++++- - NEWS | 6 ++++++ - configure.in | 2 ++ - 3 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index e9bd2c1..c2f779f 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -77,7 +77,14 @@ $(OBJS): $(HEADERS) - flist.o: rounding.h - - rounding.h: mkrounding$(EXEEXT) -- ./mkrounding$(EXEEXT) >rounding.h -+ @if test x@cross_compiling@ = xno; then \ -+ ./mkrounding$(EXEEXT) >rounding.h; \ -+ else \ -+ echo "Copy the mkrounding$(EXEEXT) command to the target machine and run it like this:"; \ -+ echo " ./mkrounding$(EXEEXT) >rounding.h"; \ -+ echo "Then copy the resulting rounding.h file to this build machine and rerun \"make\"."; \ -+ exit 1; \ -+ fi - - mkrounding$(EXEEXT): mkrounding.c rsync.h - @sed '1,/^struct file_struct/d; /^}/,$$d' <$(srcdir)/rsync.h >mkrounding.h -diff --git a/NEWS b/NEWS -index 9d23af0..bf6067e 100644 ---- a/NEWS -+++ b/NEWS -@@ -4,6 +4,12 @@ Changes since 2.6.9: - - BUG FIXES: - -+ - If a file's data arrived successfully on the receiving side but the -+ rename of the tempory file to the destination file failed AND the -+ --remove-souce-files (or the deprecated --remove-sent-files) option -+ was specified, rsync no longer erroneously removes the associated -+ source file. -+ - - Fixed the output of -ii when combined with one of the --*-dest options: - it now itemizes all the items, not just the changed ones. - -diff --git a/configure.in b/configure.in -index 890a76b..aee2693 100644 ---- a/configure.in -+++ b/configure.in -@@ -805,6 +805,8 @@ AC_SUBST(OBJ_SAVE) - AC_SUBST(OBJ_RESTORE) - AC_SUBST(CC_SHOBJ_FLAG) - AC_SUBST(BUILD_POPT) -+AC_SUBST(cross_compiling) -+ - - AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) - AC_OUTPUT --- -1.7.9.5 - diff --git a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0002-Changed-the-creation-of-rounding.h-to-use-a-set-of-c.patch b/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0002-Changed-the-creation-of-rounding.h-to-use-a-set-of-c.patch deleted file mode 100644 index 438f12d6..00000000 --- a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0002-Changed-the-creation-of-rounding.h-to-use-a-set-of-c.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 30932a3a7a3843c23577d0fdc6d61311b0454766 Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayned@samba.org> -Date: Tue, 1 Jan 2008 10:27:19 -0800 -Subject: [PATCH 2/4] Changed the creation of rounding.h to use a set of - compile-time checks similar to how configure determines - the size of variables. - -Conflicts: - - .gitignore - Makefile.in - configure.in ---- - Makefile.in | 27 ++++++++++++++------------- - configure.in | 1 - - mkrounding.c | 46 +++++++++------------------------------------- - 3 files changed, 23 insertions(+), 51 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index c2f779f..a660a75 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -76,21 +76,22 @@ $(OBJS): $(HEADERS) - - flist.o: rounding.h - --rounding.h: mkrounding$(EXEEXT) -- @if test x@cross_compiling@ = xno; then \ -- ./mkrounding$(EXEEXT) >rounding.h; \ -- else \ -- echo "Copy the mkrounding$(EXEEXT) command to the target machine and run it like this:"; \ -- echo " ./mkrounding$(EXEEXT) >rounding.h"; \ -- echo "Then copy the resulting rounding.h file to this build machine and rerun \"make\"."; \ -+rounding.h: mkrounding.c rsync.h -+ @for r in 0 1 3; do \ -+ if $(CC) $(CFLAGS) $(LDFLAGS) -o mkrounding -DEXTRA_ROUNDING=$$r -I. $(srcdir)/mkrounding.c >/dev/null 2>&1; then \ -+ echo "#define EXTRA_ROUNDING $$r" >rounding.h; \ -+ if test -f "$$HOME/build_farm/build_test.fns"; then \ -+ echo "EXTRA_ROUNDING is $$r" >&2; \ -+ fi; \ -+ break; \ -+ fi; \ -+ done -+ @rm -f mkrounding -+ @if test -f rounding.h; then : ; else \ -+ echo "Failed to create rounding.h!"; \ - exit 1; \ - fi - --mkrounding$(EXEEXT): mkrounding.c rsync.h -- @sed '1,/^struct file_struct/d; /^}/,$$d' <$(srcdir)/rsync.h >mkrounding.h -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -I. $(srcdir)/mkrounding.c -- @rm mkrounding.h -- - tls$(EXEEXT): $(TLS_OBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS) - -@@ -119,7 +120,7 @@ proto: - - clean: cleantests - rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS) \ -- mkrounding mkrounding.h rounding.h -+ mkrounding rounding.h - - cleantests: - rm -rf ./testtmp* -diff --git a/configure.in b/configure.in -index aee2693..61458cf 100644 ---- a/configure.in -+++ b/configure.in -@@ -805,7 +805,6 @@ AC_SUBST(OBJ_SAVE) - AC_SUBST(OBJ_RESTORE) - AC_SUBST(CC_SHOBJ_FLAG) - AC_SUBST(BUILD_POPT) --AC_SUBST(cross_compiling) - - - AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) -diff --git a/mkrounding.c b/mkrounding.c -index a5a5229..ec0f277 100644 ---- a/mkrounding.c -+++ b/mkrounding.c -@@ -1,47 +1,19 @@ - #include "rsync.h" - --struct test1 { -- union file_extras extras1[1]; -- struct { --# include "mkrounding.h" -- } file; --}; -- --struct test2 { -- union file_extras extras2[2]; -- struct { --# include "mkrounding.h" -- } file; --}; -+#define ARRAY_LEN (EXTRA_ROUNDING+1) -+#define SIZEOF(x) ((long int)sizeof (x)) - --struct test4 { -- union file_extras extras4[4]; -- struct { --# include "mkrounding.h" -- } file; -+struct test { -+ union file_extras extras[ARRAY_LEN]; -+ struct file_struct file; - }; - --#define SIZE_TEST(n) (sizeof (struct test ## n) == EXTRA_LEN * n + sizeof (struct file_struct)) -+#define ACTUAL_SIZE SIZEOF(struct test) -+#define EXPECTED_SIZE (SIZEOF(union file_extras) * ARRAY_LEN + SIZEOF(struct file_struct)) - - int main(UNUSED(int argc), UNUSED(char *argv[])) - { -- int cnt; -- if (SIZE_TEST(1)) -- cnt = 0; -- else if (SIZE_TEST(2)) -- cnt = 1; -- else if (SIZE_TEST(4)) -- cnt = 3; -- else { -- fprintf(stderr, "Unable to determine required file_extras rounding!\n"); -- cnt = 3; -- } -- if (cnt) -- fprintf(stderr, "Rounding file_extras in multiples of %d", cnt + 1); -- else -- fprintf(stderr, "No rounding needed for file_extras"); -- fprintf(stderr, " (EXTRA_LEN=%d, FILE_STRUCT_LEN=%d)\n", -- (int)EXTRA_LEN, (int)FILE_STRUCT_LEN); -- printf("#define EXTRA_ROUNDING %d\n", cnt); -+ static int test_array[1 - 2 * (ACTUAL_SIZE != EXPECTED_SIZE)]; -+ test_array[0] = 0; - return 0; - } --- -1.7.9.5 - diff --git a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0003-Renamed-mkrounding.c-to-rounding.c.patch b/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0003-Renamed-mkrounding.c-to-rounding.c.patch deleted file mode 100644 index 60d718e8..00000000 --- a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0003-Renamed-mkrounding.c-to-rounding.c.patch +++ /dev/null @@ -1,104 +0,0 @@ -From f41f666ea6b6bec85b40d4abb483b55438897f62 Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayned@samba.org> -Date: Tue, 1 Jan 2008 10:34:27 -0800 -Subject: [PATCH 3/4] Renamed mkrounding.c to rounding.c. (cherry picked from - commit a5fd4b6e6e3d4649f0f65cd4a0385283fe69154c) - -Conflicts: - - Makefile.in ---- - Makefile.in | 8 ++++---- - mkrounding.c | 19 ------------------- - rounding.c | 19 +++++++++++++++++++ - 3 files changed, 23 insertions(+), 23 deletions(-) - delete mode 100644 mkrounding.c - create mode 100644 rounding.c - -diff --git a/Makefile.in b/Makefile.in -index a660a75..8b5e2f1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -76,9 +76,9 @@ $(OBJS): $(HEADERS) - - flist.o: rounding.h - --rounding.h: mkrounding.c rsync.h -+rounding.h: rounding.c rsync.h - @for r in 0 1 3; do \ -- if $(CC) $(CFLAGS) $(LDFLAGS) -o mkrounding -DEXTRA_ROUNDING=$$r -I. $(srcdir)/mkrounding.c >/dev/null 2>&1; then \ -+ if $(CC) $(CFLAGS) $(LDFLAGS) -o rounding -DEXTRA_ROUNDING=$$r -I. $(srcdir)/rounding.c >/dev/null 2>&1; then \ - echo "#define EXTRA_ROUNDING $$r" >rounding.h; \ - if test -f "$$HOME/build_farm/build_test.fns"; then \ - echo "EXTRA_ROUNDING is $$r" >&2; \ -@@ -86,7 +86,7 @@ rounding.h: mkrounding.c rsync.h - break; \ - fi; \ - done -- @rm -f mkrounding -+ @rm -f rounding - @if test -f rounding.h; then : ; else \ - echo "Failed to create rounding.h!"; \ - exit 1; \ -@@ -120,7 +120,7 @@ proto: - - clean: cleantests - rm -f *~ $(OBJS) $(TLS_OBJ) $(CHECK_PROGS) $(CHECK_OBJS) \ -- mkrounding rounding.h -+ rounding rounding.h - - cleantests: - rm -rf ./testtmp* -diff --git a/mkrounding.c b/mkrounding.c -deleted file mode 100644 -index ec0f277..0000000 ---- a/mkrounding.c -+++ /dev/null -@@ -1,19 +0,0 @@ --#include "rsync.h" -- --#define ARRAY_LEN (EXTRA_ROUNDING+1) --#define SIZEOF(x) ((long int)sizeof (x)) -- --struct test { -- union file_extras extras[ARRAY_LEN]; -- struct file_struct file; --}; -- --#define ACTUAL_SIZE SIZEOF(struct test) --#define EXPECTED_SIZE (SIZEOF(union file_extras) * ARRAY_LEN + SIZEOF(struct file_struct)) -- -- int main(UNUSED(int argc), UNUSED(char *argv[])) --{ -- static int test_array[1 - 2 * (ACTUAL_SIZE != EXPECTED_SIZE)]; -- test_array[0] = 0; -- return 0; --} -diff --git a/rounding.c b/rounding.c -new file mode 100644 -index 0000000..ec0f277 ---- /dev/null -+++ b/rounding.c -@@ -0,0 +1,19 @@ -+#include "rsync.h" -+ -+#define ARRAY_LEN (EXTRA_ROUNDING+1) -+#define SIZEOF(x) ((long int)sizeof (x)) -+ -+struct test { -+ union file_extras extras[ARRAY_LEN]; -+ struct file_struct file; -+}; -+ -+#define ACTUAL_SIZE SIZEOF(struct test) -+#define EXPECTED_SIZE (SIZEOF(union file_extras) * ARRAY_LEN + SIZEOF(struct file_struct)) -+ -+ int main(UNUSED(int argc), UNUSED(char *argv[])) -+{ -+ static int test_array[1 - 2 * (ACTUAL_SIZE != EXPECTED_SIZE)]; -+ test_array[0] = 0; -+ return 0; -+} --- -1.7.9.5 - diff --git a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0004-Improved-the-manpage-install-rules.patch b/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0004-Improved-the-manpage-install-rules.patch deleted file mode 100644 index 83163713..00000000 --- a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/0004-Improved-the-manpage-install-rules.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ae41600a129cc0ada5ce33b1c5c1afc8c3c9cb63 Mon Sep 17 00:00:00 2001 -From: Wayne Davison <wayned@samba.org> -Date: Fri, 9 Nov 2007 18:12:40 +0000 -Subject: [PATCH 4/4] Improved the manpage install rules. (cherry picked from - commit c8dccf8fb4949ad8f2c25f86808b517a5b30faf9) - -Conflicts: - - Makefile.in ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 8b5e2f1..de37ddc 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -63,8 +63,8 @@ install: all - ${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir} - -mkdir -p ${DESTDIR}${mandir}/man1 - -mkdir -p ${DESTDIR}${mandir}/man5 -- ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1 -- ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5 -+ if test -f $(srcdir)/rsync.1; then ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1; fi -+ if test -f $(srcdir)/rsyncd.conf.5; then ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi - - install-strip: - $(MAKE) INSTALL_STRIP='-s' install --- -1.7.9.5 - diff --git a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/addrinfo.h b/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/addrinfo.h deleted file mode 100644 index 1cf241f6..00000000 --- a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/addrinfo.h +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/** - * @file addrinfo.h - * - * Replacement getaddrinfo() for machines that don't have it. The new - * getaddrinfo()/getnameinfo() interface is implemented on top of the - * traditional resolver calls. - **/ - -#ifndef HAVE_GETADDRINFO - -#ifndef EAI_ADDRFAMILY -/* - * Error return codes from getaddrinfo() - */ -#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */ -#define EAI_AGAIN 2 /* temporary failure in name resolution */ -#define EAI_BADFLAGS 3 /* invalid value for ai_flags */ -#define EAI_FAIL 4 /* non-recoverable failure in name resolution */ -#define EAI_FAMILY 5 /* ai_family not supported */ -#define EAI_MEMORY 6 /* memory allocation failure */ -#define EAI_NODATA 7 /* no address associated with hostname */ -#define EAI_NONAME 8 /* hostname nor servname provided, or not known */ -#define EAI_SERVICE 9 /* servname not supported for ai_socktype */ -#define EAI_SOCKTYPE 10 /* ai_socktype not supported */ -#define EAI_SYSTEM 11 /* system error returned in errno */ -#define EAI_BADHINTS 12 -#define EAI_PROTOCOL 13 -#define EAI_MAX 14 -#endif /* ndef EAI_ADDRFAMILY */ - -/* - * Flag values for getaddrinfo() - */ - -#ifndef AI_PASSIVE - -#define AI_PASSIVE 0x00000001 /* get address to use bind() */ -#define AI_CANONNAME 0x00000002 /* fill ai_canonname */ -#define AI_NUMERICHOST 0x00000004 /* prevent name resolution */ -/* valid flags for addrinfo */ -#define AI_MASK (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST) - -#define AI_ALL 0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */ -#define AI_V4MAPPED_CFG 0x00000200 /* accept IPv4-mapped if kernel supports */ -#define AI_ADDRCONFIG 0x00000400 /* only if any address is assigned */ -#define AI_V4MAPPED 0x00000800 /* accept IPv4-mapped IPv6 address */ -/* special recommended flags for getipnodebyname */ -#define AI_DEFAULT (AI_V4MAPPED_CFG | AI_ADDRCONFIG) - -/* - * Constants for getnameinfo() - */ -#define NI_MAXHOST 1025 -#define NI_MAXSERV 32 - -/* - * Flag values for getnameinfo() - */ -#define NI_NOFQDN 0x00000001 -#define NI_NUMERICHOST 0x00000002 -#define NI_NAMEREQD 0x00000004 -#define NI_NUMERICSERV 0x00000008 -#define NI_DGRAM 0x00000010 - -struct addrinfo { - int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ - int ai_family; /* PF_xxx */ - int ai_socktype; /* SOCK_xxx */ - int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ - size_t ai_addrlen; /* length of ai_addr */ - char *ai_canonname; /* canonical name for hostname */ - struct sockaddr *ai_addr; /* binary address */ - struct addrinfo *ai_next; /* next structure in linked list */ -}; - -extern void freehostent(struct hostent *); -extern char *gai_strerror(int); -#endif /* AI_PASSIVE */ -#endif /* HAVE_GETADDRINFO */ - -#ifndef HAVE_SOCKADDR_STORAGE -struct sockaddr_storage { - unsigned long align; - unsigned char fill[128 - sizeof (unsigned long)]; -}; -#endif diff --git a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/force-protocol-version-29.patch b/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/force-protocol-version-29.patch deleted file mode 100644 index ec198748..00000000 --- a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/force-protocol-version-29.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur old/rsync.h new/rsync.h ---- old/rsync.h 2014-04-08 18:21:34.000000000 +1100 -+++ new/rsync.h 2014-04-15 20:28:02.000000000 +1100 -@@ -82,7 +82,7 @@ - == ((unsigned)(b2) & (unsigned)(mask))) - - /* update this if you make incompatible changes */ --#define PROTOCOL_VERSION 30 -+#define PROTOCOL_VERSION 29 - - /* We refuse to interoperate with versions that are not in this range. - * Note that we assume we'll work with later versions: the onus is on diff --git a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/rsyncd.conf b/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/rsyncd.conf deleted file mode 100644 index 8d21249d..00000000 --- a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync/rsyncd.conf +++ /dev/null @@ -1,19 +0,0 @@ -# --------------------------------------------------------------------------------------------------------------------- -# SPDX-License-Identifier: GPL-2.0-or-later -# --------------------------------------------------------------------------------------------------------------------- - -# /etc/rsyncd.conf - -# Minimal configuration file for rsync daemon -# See rsync(1) and rsyncd.conf(5) man pages for help - -# This file is required by rsync --daemon -pid file = /var/run/rsyncd.pid -use chroot = yes -read only = yes - -# Simple example for enabling your own local rsync server -#[everything] -# path = / -# comment = Everything except /etc exposed -# exclude = /etc diff --git a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync_2.6.9+git.bb b/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync_2.6.9+git.bb deleted file mode 100644 index 896669b8..00000000 --- a/meta-sokol-flex-staging/dynamic-layers/gplv2/recipes-devtools/rsync/rsync_2.6.9+git.bb +++ /dev/null @@ -1,28 +0,0 @@ -# --------------------------------------------------------------------------------------------------------------------- -# SPDX-License-Identifier: MIT -# --------------------------------------------------------------------------------------------------------------------- - -require recipes-devtools/rsync/rsync_2.6.9.bb - -SRC_URI = "git://git.samba.org/rsync.git;protocol=https;branch=master \ - file://rsyncd.conf \ - file://addrinfo.h \ - file://0001-If-we-re-cross-compiling-tell-the-user-to-run-mkroun.patch \ - file://0002-Changed-the-creation-of-rounding.h-to-use-a-set-of-c.patch \ - file://0003-Renamed-mkrounding.c-to-rounding.c.patch \ - file://0004-Improved-the-manpage-install-rules.patch \ - file://force-protocol-version-29.patch \ -" - -SRCREV = "496c809f8cf529c5a95f9578b34a9299b0d92ffb" -PV .= "${SRCPV}" - -S = "${WORKDIR}/git" - -do_configure:prepend () { - install ${WORKDIR}/addrinfo.h ${S}/lib/ -} - -do_configure:append () { - oe_runmake proto -} diff --git a/meta-sokol-flex-staging/dynamic-layers/openembedded-layer/recipes-support/ccid/ccid_1.4.33.bbappend b/meta-sokol-flex-staging/dynamic-layers/openembedded-layer/recipes-support/ccid/ccid_%.bbappend index 86015763..86015763 100644 --- a/meta-sokol-flex-staging/dynamic-layers/openembedded-layer/recipes-support/ccid/ccid_1.4.33.bbappend +++ b/meta-sokol-flex-staging/dynamic-layers/openembedded-layer/recipes-support/ccid/ccid_%.bbappend diff --git a/meta-sokol-flex-support/conf/layer.conf b/meta-sokol-flex-support/conf/layer.conf index b28f5564..636df979 100644 --- a/meta-sokol-flex-support/conf/layer.conf +++ b/meta-sokol-flex-support/conf/layer.conf @@ -19,7 +19,7 @@ BBFILE_COLLECTIONS += "sokol-flex-support" BBFILE_PRIORITY_sokol-flex-support = "4" BBFILE_PATTERN_sokol-flex-support = "^${LAYERDIR_RE}/" LAYERDEPENDS_sokol-flex-support = "core sokol-flex-common" -LAYERSERIES_COMPAT_sokol-flex-support = "kirkstone" +LAYERSERIES_COMPAT_sokol-flex-support = "langdale" PREFERRED_PROVIDER_virtual/nativesdk-update-alternatives ??= "nativesdk-opkg-utils" PREFERRED_PROVIDER_chkconfig-alternatives ??= "chkconfig-alternatives" diff --git a/scripts/build-setup-environment.in b/scripts/build-setup-environment.in index 435cf705..b01233a6 100644 --- a/scripts/build-setup-environment.in +++ b/scripts/build-setup-environment.in @@ -9,7 +9,6 @@ elif [ -n "$ZSH_NAME" ]; then else BUILDDIR="$(pwd -P)" fi -export TEMPLATECONF="@TEMPLATECONF@" OEINIT="$(find "@OEROOT@" -maxdepth 1 -name \*-init-build-env | head -n 1)" if [ -z "$OEINIT" ]; then echo >&2 "oe-init-build-env not found in @OEROOT@" @@ -17,7 +16,7 @@ if [ -z "$OEINIT" ]; then else . "$OEINIT" "$BUILDDIR" "@BITBAKEDIR@" export BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS GIT_SSL_CAINFO SALT_LICENSE_SERVER" - unset TEMPLATECONF OEINIT + unset OEINIT cd "$BUILDDIR" command -v bitbake >/dev/null 2>&1 fi diff --git a/scripts/setup-flex-builddir b/scripts/setup-flex-builddir index 5fa367d0..c2c2ab10 100755 --- a/scripts/setup-flex-builddir +++ b/scripts/setup-flex-builddir @@ -292,10 +292,6 @@ setup_builddir () { fi fi - if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then - echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" - fi - if [ ! -e $BUILDDIR/conf/local.conf ]; then cp $TEMPLATECONF/local.conf.sample $BUILDDIR/conf/local.conf echo "You had no local.conf file. This configuration file has therefore been" @@ -331,8 +327,7 @@ setup_builddir () { cat "$scriptsdir/build-setup-environment.in" \ | sed -e "s#@OEROOT@#$OEROOT#g" \ - -e "s#@BITBAKEDIR@#$BITBAKEDIR#g" \ - -e "s#@TEMPLATECONF@#$TEMPLATECONF#g" >"$BUILDDIR/setup-environment" + -e "s#@BITBAKEDIR@#$BITBAKEDIR#g" >"$BUILDDIR/setup-environment" } scriptsdir="$(cd $(dirname $0) && pwd)" |