--- ...-implicit-declaration-of-release_get_sha2.patch | 78 ++++++++++++++++++++++ meta/recipes-devtools/opkg/opkg_0.3.2.bb | 1 + 2 files changed, 79 insertions(+) create mode 100644 meta/recipes-devtools/opkg/opkg/0001-release-fix-implicit-declaration-of-release_get_sha2.patch
diff --git a/meta/recipes-devtools/opkg/opkg/0001-release-fix-implicit-declaration-of-release_get_sha2.patch b/meta/recipes-devtools/opkg/opkg/0001-release-fix-implicit-declaration-of-release_get_sha2.patch new file mode 100644 index 0000000..57f5fe8 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/0001-release-fix-implicit-declaration-of-release_get_sha2.patch @@ -0,0 +1,78 @@ +From 3fe6c043f5d62710f86ca92692b02f4ffd3bb5c9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <a...@andred.net> +Date: Fri, 24 Jun 2016 13:18:52 +0100 +Subject: [PATCH] release: fix implicit declaration of release_get_sha256() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| ../../opkg-0.3.2/libopkg/release.c: In function ‘release_verify_file’: +| ../../opkg-0.3.2/libopkg/release.c:120:26: warning: implicit declaration of function ‘release_get_sha256’ [-Wimplicit-function-declaration] +| const char *sha256 = release_get_sha256(release, pathname); +| ^ +| ../../opkg-0.3.2/libopkg/release.c:120:26: warning: initialization makes pointer from integer without a cast [-Wint-conversion] +| ../../opkg-0.3.2/libopkg/release.c: At top level: +| ../../opkg-0.3.2/libopkg/release.c:324:13: error: conflicting types for ‘release_get_sha256’ +| const char *release_get_sha256(release_t * release, const char *pathname) +| ^ +| ../../opkg-0.3.2/libopkg/release.c:120:26: note: previous implicit declaration of ‘release_get_sha256’ was here +| const char *sha256 = release_get_sha256(release, pathname); +| ^ + +At the same time, make it static, too, similar to +release_get_md5(). + +Signed-off-by: André Draszik <adras...@tycoint.com> +Signed-off-by: Alejandro del Castillo <alejandro.delcasti...@ni.com> +--- +Upstream-Status: Backport + + libopkg/release.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/libopkg/release.c b/libopkg/release.c +index b6aceb4..7db0bd4 100644 +--- a/libopkg/release.c ++++ b/libopkg/release.c +@@ -109,6 +109,20 @@ static const char *release_get_md5(release_t * release, const char *pathname) + return '\0'; + } + ++#ifdef HAVE_SHA256 ++static const char *release_get_sha256(release_t * release, const char *pathname) ++{ ++ const cksum_t *cksum; ++ ++ if (release->sha256sums) { ++ cksum = cksum_list_find(release->sha256sums, pathname); ++ return cksum->value; ++ } ++ ++ return '\0'; ++} ++#endif ++ + int release_verify_file(release_t * release, const char *file_name, + const char *pathname) + { +@@ -319,17 +333,3 @@ int release_download(release_t * release, pkg_src_t * dist, char *lists_dir, + + return ret; + } +- +-#ifdef HAVE_SHA256 +-const char *release_get_sha256(release_t * release, const char *pathname) +-{ +- const cksum_t *cksum; +- +- if (release->sha256sums) { +- cksum = cksum_list_find(release->sha256sums, pathname); +- return cksum->value; +- } +- +- return '\0'; +-} +-#endif +-- +2.8.1 + diff --git a/meta/recipes-devtools/opkg/opkg_0.3.2.bb b/meta/recipes-devtools/opkg/opkg_0.3.2.bb index 0251b7d..5731939 100644 --- a/meta/recipes-devtools/opkg/opkg_0.3.2.bb +++ b/meta/recipes-devtools/opkg/opkg_0.3.2.bb @@ -15,6 +15,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz file://opkg-configure.service \ file://opkg.conf \ file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ + file://0001-release-fix-implicit-declaration-of-release_get_sha2.patch \ " SRC_URI[md5sum] = "b2cc1baa89d0b3d49e63ab002fd2e0a6" -- 2.8.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core