* [PATCH] i2c-tools: upgrade to 4.0
@ 2017-12-07 13:22 Maxin B. John
2017-12-09 16:57 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Maxin B. John @ 2017-12-07 13:22 UTC (permalink / raw)
To: openembedded-core
Update the SRC_URI to point to kernel.org location where
i2c-tools is hosted these days.
Remove Modules.mk since it was used for deprecated binaries
(eepromer, eeprom)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
meta/recipes-devtools/i2c-tools/files/Module.mk | 72 ----------------------
.../{i2c-tools_3.1.2.bb => i2c-tools_4.0.bb} | 14 ++---
2 files changed, 5 insertions(+), 81 deletions(-)
delete mode 100644 meta/recipes-devtools/i2c-tools/files/Module.mk
rename meta/recipes-devtools/i2c-tools/{i2c-tools_3.1.2.bb => i2c-tools_4.0.bb} (64%)
diff --git a/meta/recipes-devtools/i2c-tools/files/Module.mk b/meta/recipes-devtools/i2c-tools/files/Module.mk
deleted file mode 100644
index fcaf72f..0000000
--- a/meta/recipes-devtools/i2c-tools/files/Module.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-# EEPROMER
-#
-# Licensed under the GNU General Public License.
-
-EEPROMER_DIR := eepromer
-
-EEPROMER_CFLAGS := -Wstrict-prototypes -Wshadow -Wpointer-arith -Wcast-qual \
- -Wcast-align -Wwrite-strings -Wnested-externs -Winline \
- -W -Wundef -Wmissing-prototypes -Iinclude
-
-EEPROMER_TARGETS := eepromer eeprom eeprog
-
-#
-# Programs
-#
-
-$(EEPROMER_DIR)/eepromer: $(EEPROMER_DIR)/eepromer.o
- $(CC) $(LDFLAGS) -o $@ $^
-
-$(EEPROMER_DIR)/eeprom: $(EEPROMER_DIR)/eeprom.o
- $(CC) $(LDFLAGS) -o $@ $^
-
-$(EEPROMER_DIR)/eeprog: $(EEPROMER_DIR)/eeprog.o $(EEPROMER_DIR)/24cXX.o
- $(CC) $(LDFLAGS) -o $@ $^
-
-#
-# Objects
-#
-
-$(EEPROMER_DIR)/eepromer.o: $(EEPROMER_DIR)/eepromer.c
- $(CC) $(CFLAGS) $(EEPROMER_CFLAGS) -c $< -o $@
-
-$(EEPROMER_DIR)/eeprom.o: $(EEPROMER_DIR)/eeprom.c
- $(CC) $(CFLAGS) $(EEPROMER_CFLAGS) -c $< -o $@
-
-$(EEPROMER_DIR)/eeprog.o: $(EEPROMER_DIR)/eeprog.c
- $(CC) $(CFLAGS) $(EEPROMER_CFLAGS) -c $< -o $@
-
-$(EEPROMER_DIR)/24cXX.o: $(EEPROMER_DIR)/24cXX.c
- $(CC) $(CFLAGS) $(EEPROMER_CFLAGS) -c $< -o $@
-
-#
-# Commands
-#
-
-all-eepromer: $(addprefix $(EEPROMER_DIR)/,$(EEPROMER_TARGETS))
-
-strip-eepromer: $(addprefix $(EEPROMER_DIR)/,$(EEPROMER_TARGETS))
- strip $(addprefix $(EEPROMER_DIR)/,$(EEPROMER_TARGETS))
-
-clean-eepromer:
- $(RM) $(addprefix $(EEPROMER_DIR)/,*.o $(EEPROMER_TARGETS))
-
-install-eepromer: $(addprefix $(EEPROMER_DIR)/,$(EEPROMER_TARGETS))
- $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir)
- for program in $(EEPROMER_TARGETS) ; do \
- $(INSTALL_PROGRAM) $(EEPROMER_DIR)/$$program $(DESTDIR)$(sbindir) ; done
-
-uninstall-eepromer:
- for program in $(EEPROMER_TARGETS) ; do \
- $(RM) $(DESTDIR)$(sbindir)/$$program ; \
- $(RM) $(DESTDIR)$(man8dir)/$$program.8 ; done
-
-all: all-eepromer
-
-strip: strip-eepromer
-
-clean: clean-eepromer
-
-install: install-eepromer
-
-uninstall: uninstall-eepromer
diff --git a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb b/meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb
similarity index 64%
rename from meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb
rename to meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb
index 45d3d6d..12d718b 100644
--- a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb
+++ b/meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb
@@ -4,20 +4,16 @@ SECTION = "base"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.bz2 \
- file://Module.mk \
-"
-UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/i/i2c-tools/"
-UPSTREAM_CHECK_REGEX = "i2c-tools_(?P<pver>.+)\.orig"
-SRC_URI[md5sum] = "7104a1043d11a5e2c7b131614eb1b962"
-SRC_URI[sha256sum] = "db5e69f2e2a6e3aa2ecdfe6a5f490b149c504468770f58921c8c5b8a7860a441"
+SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/${BP}.tar.gz"
+
+SRC_URI[md5sum] = "d92a288d70f306d3895e3a7e9c14c9aa"
+SRC_URI[sha256sum] = "5b60daf6f011de0acb61de57dba62f2054bb39f19961d67e0c91610f071ca403"
inherit autotools-brokensep
do_compile_prepend() {
- cp ${WORKDIR}/Module.mk ${S}/eepromer/
sed -i 's#/usr/local#/usr#' ${S}/Makefile
- echo "include eepromer/Module.mk" >> ${S}/Makefile
+ echo "include eeprog/Module.mk" >> ${S}/Makefile
}
do_install_append() {
--
2.4.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] i2c-tools: upgrade to 4.0
2017-12-07 13:22 [PATCH] i2c-tools: upgrade to 4.0 Maxin B. John
@ 2017-12-09 16:57 ` Richard Purdie
2017-12-09 17:17 ` Richard Purdie
2017-12-12 13:17 ` Alexander Kanavin
0 siblings, 2 replies; 6+ messages in thread
From: Richard Purdie @ 2017-12-09 16:57 UTC (permalink / raw)
To: Maxin B. John, openembedded-core
On Thu, 2017-12-07 at 15:22 +0200, Maxin B. John wrote:
> Update the SRC_URI to point to kernel.org location where
> i2c-tools is hosted these days.
>
> Remove Modules.mk since it was used for deprecated binaries
> (eepromer, eeprom)
>
> Signed-off-by: Maxin B. John <maxin.john@intel.com>
> ---
> meta/recipes-devtools/i2c-tools/files/Module.mk | 72 ------------
> ----------
> .../{i2c-tools_3.1.2.bb => i2c-tools_4.0.bb} | 14 ++---
> 2 files changed, 5 insertions(+), 81 deletions(-)
> delete mode 100644 meta/recipes-devtools/i2c-tools/files/Module.mk
> rename meta/recipes-devtools/i2c-tools/{i2c-tools_3.1.2.bb => i2c-
> tools_4.0.bb} (64%)
Fails on musl sadly:
https://autobuilder.yocto.io/builders/nightly-musl/builds/643/steps/BuildImages/logs/stdio
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] i2c-tools: upgrade to 4.0
2017-12-09 16:57 ` Richard Purdie
@ 2017-12-09 17:17 ` Richard Purdie
2017-12-18 15:16 ` Maxin B. John
2017-12-12 13:17 ` Alexander Kanavin
1 sibling, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2017-12-09 17:17 UTC (permalink / raw)
To: Maxin B. John, openembedded-core
On Sat, 2017-12-09 at 16:57 +0000, Richard Purdie wrote:
> On Thu, 2017-12-07 at 15:22 +0200, Maxin B. John wrote:
> >
> > Update the SRC_URI to point to kernel.org location where
> > i2c-tools is hosted these days.
> >
> > Remove Modules.mk since it was used for deprecated binaries
> > (eepromer, eeprom)
> >
> > Signed-off-by: Maxin B. John <maxin.john@intel.com>
> > ---
> > meta/recipes-devtools/i2c-tools/files/Module.mk | 72 ----------
> > --
> > ----------
> > .../{i2c-tools_3.1.2.bb => i2c-tools_4.0.bb} | 14 ++---
> > 2 files changed, 5 insertions(+), 81 deletions(-)
> > delete mode 100644 meta/recipes-devtools/i2c-tools/files/Module.mk
> > rename meta/recipes-devtools/i2c-tools/{i2c-tools_3.1.2.bb => i2c-
> > tools_4.0.bb} (64%)
> Fails on musl sadly:
>
> https://autobuilder.yocto.io/builders/nightly-musl/builds/643/steps/B
> uildImages/logs/stdio
and on glibc qemux86-64:
https://autobuilder.yocto.io/builders/nightly-world/builds/622
Build race?
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] i2c-tools: upgrade to 4.0
2017-12-09 17:17 ` Richard Purdie
@ 2017-12-18 15:16 ` Maxin B. John
0 siblings, 0 replies; 6+ messages in thread
From: Maxin B. John @ 2017-12-18 15:16 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
Hi RP,
On Sat, Dec 09, 2017 at 05:17:53PM +0000, Richard Purdie wrote:
> On Sat, 2017-12-09 at 16:57 +0000, Richard Purdie wrote:
> > On Thu, 2017-12-07 at 15:22 +0200, Maxin B. John wrote:
> > >
> > > Update the SRC_URI to point to kernel.org location where
> > > i2c-tools is hosted these days.
> > >
> > > Remove Modules.mk since it was used for deprecated binaries
> > > (eepromer, eeprom)
> > >
> > > Signed-off-by: Maxin B. John <maxin.john@intel.com>
> > > ---
> > > meta/recipes-devtools/i2c-tools/files/Module.mk | 72 ----------
> > > --
> > > ----------
> > > .../{i2c-tools_3.1.2.bb => i2c-tools_4.0.bb} | 14 ++---
> > > 2 files changed, 5 insertions(+), 81 deletions(-)
> > > delete mode 100644 meta/recipes-devtools/i2c-tools/files/Module.mk
> > > rename meta/recipes-devtools/i2c-tools/{i2c-tools_3.1.2.bb => i2c-
> > > tools_4.0.bb} (64%)
> > Fails on musl sadly:
> >
> > https://autobuilder.yocto.io/builders/nightly-musl/builds/643/steps/B
> > uildImages/logs/stdio
>
> and on glibc qemux86-64:
>
> https://autobuilder.yocto.io/builders/nightly-world/builds/622
Sorry for the delay in reply.
> Build race?
Exactly! . It was partly fixed in upstream recently. Will include those fixes and
send a v2 soon.
https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/commit/?id=a6a59693066fd8da81f7107479df3e32a129247d
https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/commit/?id=08b0d67ba7eceb862cb17f52eb1911e9579726ea
> Cheers,
> Richard
Best Regards,
Maxin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] i2c-tools: upgrade to 4.0
2017-12-09 16:57 ` Richard Purdie
2017-12-09 17:17 ` Richard Purdie
@ 2017-12-12 13:17 ` Alexander Kanavin
1 sibling, 0 replies; 6+ messages in thread
From: Alexander Kanavin @ 2017-12-12 13:17 UTC (permalink / raw)
To: Richard Purdie, Maxin B. John, openembedded-core
On 12/09/2017 06:57 PM, Richard Purdie wrote:
> Fails on musl sadly:
>
> https://autobuilder.yocto.io/builders/nightly-musl/builds/643/steps/BuildImages/logs/stdio
musl is a notorious source of failures discovered late (e.g. on AB) and
resulting patch friction. I'll add a musl build test to AUH, and once
AUH is ready for consumption we should steer people towards using it -
particularly when they send patches that break on musl :)
Alex
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] pkgconf: upgrade to 1.4.0
@ 2018-01-12 12:26 Maxin B. John
2018-01-12 12:26 ` [PATCH] i2c-tools: upgrade to 4.0 Maxin B. John
0 siblings, 1 reply; 6+ messages in thread
From: Maxin B. John @ 2018-01-12 12:26 UTC (permalink / raw)
To: openembedded-core
1.3.7 -> 1.4.0
Removed following upstreamed and backported patches:
1. 0001-stdinc.h-fix-build-with-mingw.patch
2. 0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch
Change in checksum is due to bump in copyrights to 2018.
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
...imal-tweaks-to-compile-with-Visual-C-2015.patch | 224 ---------------------
.../0001-stdinc.h-fix-build-with-mingw.patch | 48 -----
.../pkgconf/{pkgconf_1.3.7.bb => pkgconf_1.4.0.bb} | 8 +-
3 files changed, 3 insertions(+), 277 deletions(-)
delete mode 100644 meta/recipes-devtools/pkgconf/pkgconf/0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch
delete mode 100644 meta/recipes-devtools/pkgconf/pkgconf/0001-stdinc.h-fix-build-with-mingw.patch
rename meta/recipes-devtools/pkgconf/{pkgconf_1.3.7.bb => pkgconf_1.4.0.bb} (89%)
diff --git a/meta/recipes-devtools/pkgconf/pkgconf/0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch b/meta/recipes-devtools/pkgconf/pkgconf/0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch
deleted file mode 100644
index 3805ad3..0000000
--- a/meta/recipes-devtools/pkgconf/pkgconf/0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From 4d7b4d7c8e9966c593f472355607204c6c80fecb Mon Sep 17 00:00:00 2001
-From: Dan Kegel <dank@kegel.com>
-Date: Sun, 4 Jun 2017 19:19:55 -0700
-Subject: [PATCH] Minimal tweaks to compile with Visual C 2015
-
-Upstream-Status: Backport
-
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
----
- getopt_long.c | 2 ++
- libpkgconf/bsdstubs.c | 1 +
- libpkgconf/libpkgconf.h | 2 +-
- libpkgconf/path.c | 10 +++++-----
- libpkgconf/pkg.c | 28 +++++++++++++++++++---------
- libpkgconf/stdinc.h | 9 +++++++--
- 6 files changed, 35 insertions(+), 17 deletions(-)
-
-diff --git a/getopt_long.c b/getopt_long.c
-index afeb68d..5ce9bfd 100644
---- a/getopt_long.c
-+++ b/getopt_long.c
-@@ -62,7 +62,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef _WIN32
- #include <unistd.h>
-+#endif
-
- #define PKGCONF_HACK_LOGICAL_OR_ALL_VALUES
-
-diff --git a/libpkgconf/bsdstubs.c b/libpkgconf/bsdstubs.c
-index 8f70ff3..2c000ac 100644
---- a/libpkgconf/bsdstubs.c
-+++ b/libpkgconf/bsdstubs.c
-@@ -17,6 +17,7 @@
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <string.h>
-
-diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h
-index 404bf0c..551d85d 100644
---- a/libpkgconf/libpkgconf.h
-+++ b/libpkgconf/libpkgconf.h
-@@ -310,7 +310,7 @@ void pkgconf_audit_log_dependency(pkgconf_client_t *client, const pkgconf_pkg_t
- /* path.c */
- void pkgconf_path_add(const char *text, pkgconf_list_t *dirlist, bool filter);
- size_t pkgconf_path_split(const char *text, pkgconf_list_t *dirlist, bool filter);
--size_t pkgconf_path_build_from_environ(const char *environ, const char *fallback, pkgconf_list_t *dirlist, bool filter);
-+size_t pkgconf_path_build_from_environ(const char *envvarname, const char *fallback, pkgconf_list_t *dirlist, bool filter);
- bool pkgconf_path_match_list(const char *path, const pkgconf_list_t *dirlist);
- void pkgconf_path_free(pkgconf_list_t *dirlist);
- bool pkgconf_path_relocate(char *buf, size_t buflen);
-diff --git a/libpkgconf/path.c b/libpkgconf/path.c
-index dddb3bf..59e003e 100644
---- a/libpkgconf/path.c
-+++ b/libpkgconf/path.c
-@@ -20,7 +20,7 @@
- # include <sys/cygwin.h>
- #endif
-
--#ifdef HAVE_SYS_STAT_H
-+#if defined(HAVE_SYS_STAT_H) && ! defined(_WIN32)
- # include <sys/stat.h>
- # define PKGCONF_CACHE_INODES
- #endif
-@@ -156,12 +156,12 @@ pkgconf_path_split(const char *text, pkgconf_list_t *dirlist, bool filter)
- /*
- * !doc
- *
-- * .. c:function:: size_t pkgconf_path_build_from_environ(const char *environ, const char *fallback, pkgconf_list_t *dirlist)
-+ * .. c:function:: size_t pkgconf_path_build_from_environ(const char *envvarname, const char *fallback, pkgconf_list_t *dirlist)
- *
- * Adds the paths specified in an environment variable to a path list. If the environment variable is not set,
- * an optional default set of paths is added.
- *
-- * :param char* environ: The environment variable to look up.
-+ * :param char* envvarname: The environment variable to look up.
- * :param char* fallback: The fallback paths to use if the environment variable is not set.
- * :param pkgconf_list_t* dirlist: The path list to add the path nodes to.
- * :param bool filter: Whether to perform duplicate filtering.
-@@ -169,11 +169,11 @@ pkgconf_path_split(const char *text, pkgconf_list_t *dirlist, bool filter)
- * :rtype: size_t
- */
- size_t
--pkgconf_path_build_from_environ(const char *environ, const char *fallback, pkgconf_list_t *dirlist, bool filter)
-+pkgconf_path_build_from_environ(const char *envvarname, const char *fallback, pkgconf_list_t *dirlist, bool filter)
- {
- const char *data;
-
-- data = getenv(environ);
-+ data = getenv(envvarname);
- if (data != NULL)
- return pkgconf_path_split(data, dirlist, filter);
-
-diff --git a/libpkgconf/pkg.c b/libpkgconf/pkg.c
-index 7aebd61..5dacae3 100644
---- a/libpkgconf/pkg.c
-+++ b/libpkgconf/pkg.c
-@@ -30,6 +30,8 @@
- # define PKG_CONFIG_REG_KEY "Software\\pkgconfig\\PKG_CONFIG_PATH"
- # undef PKG_DEFAULT_PATH
- # define PKG_DEFAULT_PATH "../lib/pkgconfig;../share/pkgconfig"
-+#define strncasecmp _strnicmp
-+#define strcasecmp _stricmp
- #endif
-
- #define PKG_CONFIG_EXT ".pc"
-@@ -134,21 +136,21 @@ static int pkgconf_pkg_parser_keyword_pair_cmp(const void *key, const void *ptr)
- static void
- pkgconf_pkg_parser_tuple_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const ptrdiff_t offset, char *value)
- {
-- char **dest = ((void *) pkg + offset);
-+ char **dest = (char **)((char *) pkg + offset);
- *dest = pkgconf_tuple_parse(client, &pkg->vars, value);
- }
-
- static void
- pkgconf_pkg_parser_fragment_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const ptrdiff_t offset, char *value)
- {
-- pkgconf_list_t *dest = ((void *) pkg + offset);
-+ pkgconf_list_t *dest = (pkgconf_list_t *)((char *) pkg + offset);
- pkgconf_fragment_parse(client, dest, &pkg->vars, value);
- }
-
- static void
- pkgconf_pkg_parser_dependency_func(const pkgconf_client_t *client, pkgconf_pkg_t *pkg, const ptrdiff_t offset, char *value)
- {
-- pkgconf_list_t *dest = ((void *) pkg + offset);
-+ pkgconf_list_t *dest = (pkgconf_list_t *)((char *) pkg + offset);
- pkgconf_dependency_parse(client, pkg, dest, value);
- }
-
-@@ -238,7 +240,7 @@ pkgconf_pkg_validate(const pkgconf_client_t *client, const pkgconf_pkg_t *pkg)
-
- for (i = 0; i < PKGCONF_ARRAY_SIZE(pkgconf_pkg_validations); i++)
- {
-- char **p = ((void *) pkg + pkgconf_pkg_validations[i].offset);
-+ char **p = (char **)((char *) pkg + pkgconf_pkg_validations[i].offset);
-
- if (*p != NULL)
- continue;
-@@ -587,7 +589,7 @@ pkgconf_scan_all(pkgconf_client_t *client, void *data, pkgconf_pkg_iteration_fun
-
- #ifdef _WIN32
- static pkgconf_pkg_t *
--pkgconf_pkg_find_in_registry_key(const pkgconf_client_t *client, HKEY hkey, const char *name)
-+pkgconf_pkg_find_in_registry_key(pkgconf_client_t *client, HKEY hkey, const char *name)
- {
- pkgconf_pkg_t *pkg = NULL;
-
-@@ -1048,8 +1050,12 @@ typedef struct {
-
- static const pkgconf_pkg_provides_vermatch_rule_t pkgconf_pkg_provides_vermatch_rules[] = {
- [PKGCONF_CMP_ANY] = {
-- .rulecmp = {},
-- .depcmp = {},
-+ .rulecmp = {
-+ [PKGCONF_CMP_ANY] = pkgconf_pkg_comparator_none,
-+ },
-+ .depcmp = {
-+ [PKGCONF_CMP_ANY] = pkgconf_pkg_comparator_none,
-+ },
- },
- [PKGCONF_CMP_LESS_THAN] = {
- .rulecmp = {
-@@ -1121,7 +1127,9 @@ static const pkgconf_pkg_provides_vermatch_rule_t pkgconf_pkg_provides_vermatch_
- [PKGCONF_CMP_EQUAL] = pkgconf_pkg_comparator_eq,
- [PKGCONF_CMP_NOT_EQUAL] = pkgconf_pkg_comparator_ne
- },
-- .depcmp = {},
-+ .depcmp = {
-+ [PKGCONF_CMP_ANY] = pkgconf_pkg_comparator_none,
-+ },
- },
- [PKGCONF_CMP_NOT_EQUAL] = {
- .rulecmp = {
-@@ -1133,7 +1141,9 @@ static const pkgconf_pkg_provides_vermatch_rule_t pkgconf_pkg_provides_vermatch_
- [PKGCONF_CMP_EQUAL] = pkgconf_pkg_comparator_ne,
- [PKGCONF_CMP_NOT_EQUAL] = pkgconf_pkg_comparator_eq
- },
-- .depcmp = {},
-+ .depcmp = {
-+ [PKGCONF_CMP_ANY] = pkgconf_pkg_comparator_none,
-+ },
- },
- };
-
-diff --git a/libpkgconf/stdinc.h b/libpkgconf/stdinc.h
-index 58cc6c7..ac7e53c 100644
---- a/libpkgconf/stdinc.h
-+++ b/libpkgconf/stdinc.h
-@@ -24,9 +24,7 @@
- #include <stdbool.h>
- #include <stdarg.h>
- #include <string.h>
--#include <dirent.h>
- #include <sys/types.h>
--#include <unistd.h>
- #include <stdint.h>
-
- #ifdef _WIN32
-@@ -34,8 +32,15 @@
- # include <windows.h>
- # include <malloc.h>
- # define PATH_DEV_NULL "nul"
-+# ifndef ssize_t
-+# include <BaseTsd.h>
-+# define ssize_t SSIZE_T
-+# endif
-+# include "win-dirent.h"
- #else
- # define PATH_DEV_NULL "/dev/null"
-+# include <dirent.h>
-+# include <unistd.h>
- #endif
-
- #endif
---
-2.4.0
-
diff --git a/meta/recipes-devtools/pkgconf/pkgconf/0001-stdinc.h-fix-build-with-mingw.patch b/meta/recipes-devtools/pkgconf/pkgconf/0001-stdinc.h-fix-build-with-mingw.patch
deleted file mode 100644
index 49ebe31..0000000
--- a/meta/recipes-devtools/pkgconf/pkgconf/0001-stdinc.h-fix-build-with-mingw.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ea28c5b34457cf7676181b284e22ea5f79a30d85 Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" <maxin.john@intel.com>
-Date: Thu, 13 Jul 2017 14:47:31 +0300
-Subject: [PATCH] stdinc.h: fix build with mingw
-
-Fixes this build error with mingw:
-...
-| compilation terminated.
-| In file included from ../pkgconf-1.3.7/libpkgconf/libpkgconf.h:19:0,
-| from ../pkgconf-1.3.7/libpkgconf/audit.c:16:
-| ../pkgconf-1.3.7/libpkgconf/stdinc.h:36:12: fatal error: BaseTsd.h: No
-such file or directory
-| # include <BaseTsd.h>
-
-Upstream-Status: Submitted
-
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
----
- libpkgconf/stdinc.h | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/libpkgconf/stdinc.h b/libpkgconf/stdinc.h
-index ac7e53c..d8efcf5 100644
---- a/libpkgconf/stdinc.h
-+++ b/libpkgconf/stdinc.h
-@@ -33,10 +33,18 @@
- # include <malloc.h>
- # define PATH_DEV_NULL "nul"
- # ifndef ssize_t
-+# ifndef __MINGW32__
- # include <BaseTsd.h>
-+# else
-+# include <basetsd.h>
-+# endif
- # define ssize_t SSIZE_T
- # endif
--# include "win-dirent.h"
-+# ifndef __MINGW32__
-+# include "win-dirent.h"
-+# else
-+# include <dirent.h>
-+# endif
- #else
- # define PATH_DEV_NULL "/dev/null"
- # include <dirent.h>
---
-2.4.0
-
diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.4.0.bb
similarity index 89%
rename from meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb
rename to meta/recipes-devtools/pkgconf/pkgconf_1.4.0.bb
index 5da0dd1..48ba598 100644
--- a/meta/recipes-devtools/pkgconf/pkgconf_1.3.7.bb
+++ b/meta/recipes-devtools/pkgconf/pkgconf_1.4.0.bb
@@ -13,18 +13,16 @@ DEFAULT_PREFERENCE = "-1"
# The pkgconf license seems to be functionally equivalent to BSD-2-Clause or
# ISC, but has different wording, so needs its own name.
LICENSE = "pkgconf"
-LIC_FILES_CHKSUM = "file://COPYING;md5=548a9d1db10cc0a84810c313a0e9266f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2214222ec1a820bd6cc75167a56925e0"
SRC_URI = "\
https://distfiles.dereferenced.org/pkgconf/pkgconf-${PV}.tar.xz \
- file://0001-Minimal-tweaks-to-compile-with-Visual-C-2015.patch \
- file://0001-stdinc.h-fix-build-with-mingw.patch \
file://pkg-config-wrapper \
file://pkg-config-native.in \
file://pkg-config-esdk.in \
"
-SRC_URI[md5sum] = "ac35c34d84eeb6a03d4d61b8555d6197"
-SRC_URI[sha256sum] = "1be7e40900c7467893c65f810211b1e68da3f8d5e70fddb883fc24839cad0339"
+SRC_URI[md5sum] = "c509c0dad5a70aa4bc3210557b7eafce"
+SRC_URI[sha256sum] = "1d112ff35dad516ffbfbdb013df3a035140618fe7632ec44ffa894a9c713301b"
inherit autotools update-alternatives
--
2.4.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] i2c-tools: upgrade to 4.0
2018-01-12 12:26 [PATCH] pkgconf: upgrade to 1.4.0 Maxin B. John
@ 2018-01-12 12:26 ` Maxin B. John
0 siblings, 0 replies; 6+ messages in thread
From: Maxin B. John @ 2018-01-12 12:26 UTC (permalink / raw)
To: openembedded-core
From: Maxin John <maxin.john@intel.com>
Update the SRC_URI to point to kernel.org location where
i2c-tools is hosted these days.
Remove Modules.mk since it was used for deprecated binaries
(eepromer, eeprom)
Backported the following patches to fix races during build:
a) 0001-tools-Module.mk-Add-missing-dependencies.patch
b) 0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch
c) 0001-lib-Module.mk-Add-missing-dependencies.patch
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
...s-eeprog-Module.mk-Add-missing-dependency.patch | 32 ++++++++++
...01-lib-Module.mk-Add-missing-dependencies.patch | 37 +++++++++++
...-tools-Module.mk-Add-missing-dependencies.patch | 69 +++++++++++++++++++++
meta/recipes-devtools/i2c-tools/files/Module.mk | 72 ----------------------
.../{i2c-tools_3.1.2.bb => i2c-tools_4.0.bb} | 21 ++++---
5 files changed, 150 insertions(+), 81 deletions(-)
create mode 100644 meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch
create mode 100644 meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch
create mode 100644 meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
delete mode 100644 meta/recipes-devtools/i2c-tools/files/Module.mk
rename meta/recipes-devtools/i2c-tools/{i2c-tools_3.1.2.bb => i2c-tools_4.0.bb} (52%)
diff --git a/meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch b/meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch
new file mode 100644
index 0000000..5b1a538
--- /dev/null
+++ b/meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch
@@ -0,0 +1,32 @@
+From 01674fefe3bd24fd93412fbb3eb4e85fe70c80aa Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <maxin.john@intel.com>
+Date: Mon, 18 Dec 2017 16:01:39 +0200
+Subject: [PATCH] i2c-tools: eeprog/Module.mk: Add missing dependency
+
+Absence of this dependency caused parallel build to run into a race
+and break.
+
+Upstream-Status: Accepted
+https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/commit/?id=f87c97317012a3b96b67237925893b8ffd5f4f50
+
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
+---
+ eeprog/Module.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eeprog/Module.mk b/eeprog/Module.mk
+index 9d36869..d215855 100644
+--- a/eeprog/Module.mk
++++ b/eeprog/Module.mk
+@@ -20,7 +20,7 @@ EEPROG_TARGETS := eeprog
+ # Programs
+ #
+
+-$(EEPROG_DIR)/eeprog: $(EEPROG_DIR)/eeprog.o $(EEPROG_DIR)/24cXX.o
++$(EEPROG_DIR)/eeprog: $(EEPROG_DIR)/eeprog.o $(EEPROG_DIR)/24cXX.o $(LIB_DEPS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(EEPROG_LDFLAGS)
+
+ #
+--
+2.4.0
+
diff --git a/meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch b/meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch
new file mode 100644
index 0000000..426b433
--- /dev/null
+++ b/meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch
@@ -0,0 +1,37 @@
+From a6a59693066fd8da81f7107479df3e32a129247d Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare@suse.de>
+Date: Wed, 6 Dec 2017 09:55:04 +0100
+Subject: [PATCH] lib/Module.mk: Add missing dependencies
+
+The lib symlinks lacked a dependency to the actual library file, so
+parallel builds could run into a race and break.
+
+Upstream-Status: Backport
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
+---
+ lib/Module.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Module.mk b/lib/Module.mk
+index 432a051..fd2c8c4 100644
+--- a/lib/Module.mk
++++ b/lib/Module.mk
+@@ -42,11 +42,11 @@ endif
+ $(LIB_DIR)/$(LIB_SHLIBNAME): $(LIB_DIR)/smbus.o
+ $(CC) -shared $(LDFLAGS) -Wl,--version-script=$(LIB_DIR)/libi2c.map -Wl,-soname,$(LIB_SHSONAME) -o $@ $^ -lc
+
+-$(LIB_DIR)/$(LIB_SHSONAME):
++$(LIB_DIR)/$(LIB_SHSONAME): $(LIB_DIR)/$(LIB_SHLIBNAME)
+ $(RM) $@
+ $(LN) $(LIB_SHLIBNAME) $@
+
+-$(LIB_DIR)/$(LIB_SHBASENAME):
++$(LIB_DIR)/$(LIB_SHBASENAME): $(LIB_DIR)/$(LIB_SHLIBNAME)
+ $(RM) $@
+ $(LN) $(LIB_SHLIBNAME) $@
+
+--
+2.4.0
+
diff --git a/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch b/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
new file mode 100644
index 0000000..e47c02a
--- /dev/null
+++ b/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
@@ -0,0 +1,69 @@
+From 08b0d67ba7eceb862cb17f52eb1911e9579726ea Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare@suse.de>
+Date: Thu, 14 Dec 2017 08:52:26 +0100
+Subject: [PATCH] tools/Module.mk: Add missing dependencies
+
+Better build the library before building the tools which link against
+it, otherwise parallel builds could run into a race and break.
+
+Upstream-Status: Backport
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+Tested-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+Acked-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
+---
+ lib/Module.mk | 7 +++++++
+ tools/Module.mk | 10 +++++-----
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/lib/Module.mk b/lib/Module.mk
+index 8a58f5b..67afe91 100644
+--- a/lib/Module.mk
++++ b/lib/Module.mk
+@@ -37,6 +37,13 @@ ifeq ($(BUILD_STATIC_LIB),1)
+ LIB_TARGETS += $(LIB_STLIBNAME)
+ endif
+
++# Library file to link against (static or dynamic)
++ifeq ($(USE_STATIC_LIB),1)
++LIB_DEPS := $(LIB_DIR)/$(LIB_STLIBNAME)
++else
++LIB_DEPS := $(LIB_DIR)/$(LIB_SHBASENAME)
++endif
++
+ #
+ # Libraries
+ #
+diff --git a/tools/Module.mk b/tools/Module.mk
+index 6421a23..609de7a 100644
+--- a/tools/Module.mk
++++ b/tools/Module.mk
+@@ -24,19 +24,19 @@ TOOLS_TARGETS := i2cdetect i2cdump i2cset i2cget i2ctransfer
+ # Programs
+ #
+
+-$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o
++$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o $(LIB_DEPS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
+
+-$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
++$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
+
+-$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
++$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
+
+-$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
++$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
+
+-$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
++$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
+
+ #
+--
+2.4.0
+
diff --git a/meta/recipes-devtools/i2c-tools/files/Module.mk b/meta/recipes-devtools/i2c-tools/files/Module.mk
deleted file mode 100644
index fcaf72f..0000000
--- a/meta/recipes-devtools/i2c-tools/files/Module.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-# EEPROMER
-#
-# Licensed under the GNU General Public License.
-
-EEPROMER_DIR := eepromer
-
-EEPROMER_CFLAGS := -Wstrict-prototypes -Wshadow -Wpointer-arith -Wcast-qual \
- -Wcast-align -Wwrite-strings -Wnested-externs -Winline \
- -W -Wundef -Wmissing-prototypes -Iinclude
-
-EEPROMER_TARGETS := eepromer eeprom eeprog
-
-#
-# Programs
-#
-
-$(EEPROMER_DIR)/eepromer: $(EEPROMER_DIR)/eepromer.o
- $(CC) $(LDFLAGS) -o $@ $^
-
-$(EEPROMER_DIR)/eeprom: $(EEPROMER_DIR)/eeprom.o
- $(CC) $(LDFLAGS) -o $@ $^
-
-$(EEPROMER_DIR)/eeprog: $(EEPROMER_DIR)/eeprog.o $(EEPROMER_DIR)/24cXX.o
- $(CC) $(LDFLAGS) -o $@ $^
-
-#
-# Objects
-#
-
-$(EEPROMER_DIR)/eepromer.o: $(EEPROMER_DIR)/eepromer.c
- $(CC) $(CFLAGS) $(EEPROMER_CFLAGS) -c $< -o $@
-
-$(EEPROMER_DIR)/eeprom.o: $(EEPROMER_DIR)/eeprom.c
- $(CC) $(CFLAGS) $(EEPROMER_CFLAGS) -c $< -o $@
-
-$(EEPROMER_DIR)/eeprog.o: $(EEPROMER_DIR)/eeprog.c
- $(CC) $(CFLAGS) $(EEPROMER_CFLAGS) -c $< -o $@
-
-$(EEPROMER_DIR)/24cXX.o: $(EEPROMER_DIR)/24cXX.c
- $(CC) $(CFLAGS) $(EEPROMER_CFLAGS) -c $< -o $@
-
-#
-# Commands
-#
-
-all-eepromer: $(addprefix $(EEPROMER_DIR)/,$(EEPROMER_TARGETS))
-
-strip-eepromer: $(addprefix $(EEPROMER_DIR)/,$(EEPROMER_TARGETS))
- strip $(addprefix $(EEPROMER_DIR)/,$(EEPROMER_TARGETS))
-
-clean-eepromer:
- $(RM) $(addprefix $(EEPROMER_DIR)/,*.o $(EEPROMER_TARGETS))
-
-install-eepromer: $(addprefix $(EEPROMER_DIR)/,$(EEPROMER_TARGETS))
- $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir)
- for program in $(EEPROMER_TARGETS) ; do \
- $(INSTALL_PROGRAM) $(EEPROMER_DIR)/$$program $(DESTDIR)$(sbindir) ; done
-
-uninstall-eepromer:
- for program in $(EEPROMER_TARGETS) ; do \
- $(RM) $(DESTDIR)$(sbindir)/$$program ; \
- $(RM) $(DESTDIR)$(man8dir)/$$program.8 ; done
-
-all: all-eepromer
-
-strip: strip-eepromer
-
-clean: clean-eepromer
-
-install: install-eepromer
-
-uninstall: uninstall-eepromer
diff --git a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb b/meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb
similarity index 52%
rename from meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb
rename to meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb
index 45d3d6d..e936fd7 100644
--- a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb
+++ b/meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb
@@ -4,20 +4,20 @@ SECTION = "base"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.bz2 \
- file://Module.mk \
+SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/${BP}.tar.gz \
+ file://0001-lib-Module.mk-Add-missing-dependencies.patch \
+ file://0001-tools-Module.mk-Add-missing-dependencies.patch \
+ file://0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch \
"
-UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/i/i2c-tools/"
-UPSTREAM_CHECK_REGEX = "i2c-tools_(?P<pver>.+)\.orig"
-SRC_URI[md5sum] = "7104a1043d11a5e2c7b131614eb1b962"
-SRC_URI[sha256sum] = "db5e69f2e2a6e3aa2ecdfe6a5f490b149c504468770f58921c8c5b8a7860a441"
+
+SRC_URI[md5sum] = "d92a288d70f306d3895e3a7e9c14c9aa"
+SRC_URI[sha256sum] = "5b60daf6f011de0acb61de57dba62f2054bb39f19961d67e0c91610f071ca403"
inherit autotools-brokensep
do_compile_prepend() {
- cp ${WORKDIR}/Module.mk ${S}/eepromer/
sed -i 's#/usr/local#/usr#' ${S}/Makefile
- echo "include eepromer/Module.mk" >> ${S}/Makefile
+ echo "include eeprog/Module.mk" >> ${S}/Makefile
}
do_install_append() {
@@ -33,4 +33,7 @@ FILES_${PN}-misc = "${sbindir}/i2c-stub-from-dump \
${bindir}/decode-dimms \
${bindir}/decode-vaio \
"
-RDEPENDS_${PN}-misc = "${PN} perl"
+RDEPENDS_${PN}-misc = "${PN} perl perl-module-posix \
+ perl-module-constant perl-module-file-basename \
+ perl-module-fcntl perl-module-strict perl-module-vars \
+ "
--
2.4.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-01-12 12:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-07 13:22 [PATCH] i2c-tools: upgrade to 4.0 Maxin B. John
2017-12-09 16:57 ` Richard Purdie
2017-12-09 17:17 ` Richard Purdie
2017-12-18 15:16 ` Maxin B. John
2017-12-12 13:17 ` Alexander Kanavin
-- strict thread matches above, loose matches on Subject: below --
2018-01-12 12:26 [PATCH] pkgconf: upgrade to 1.4.0 Maxin B. John
2018-01-12 12:26 ` [PATCH] i2c-tools: upgrade to 4.0 Maxin B. John
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.