From 792cd222c4c63b9247d71658e8e4c98c562e869a Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Wed, 30 May 2018 14:59:57 +0200 Subject: ubi-utils-klibc_2.0.2: upgrade to git rev 64f61a9 -Incorporate 3 small after-relase fixes -Fix typos in patch comments (Upstream-Status) -Remove patch enumeration from Subject line Signed-off-by: Andrea Adami Signed-off-by: Khem Raj --- .../0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch | 2 +- .../0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch | 2 +- .../ubi-utils-klibc-2.0.2/0003-Makefile.am-only-build-ubi-utils.patch | 2 +- .../0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch | 2 +- .../0005-common.h-replace-getline-with-fgets.patch | 4 ++-- meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-initramfs') diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch index 6ed167f38f..4ee9bd9a18 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch @@ -12,7 +12,7 @@ Fix build error: | ../git/include/libmissing.h:7:10: fatal error: execinfo.h: No such file or directory -Status: Inappropriate [klibc specific] +Upstream-Status: Inappropriate [klibc specific] Signed-off-by: Andrea Adami --- diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch index bb675a7be1..5c6e097493 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch @@ -1,7 +1,7 @@ From 01c98d5d5d044d9a125abcdbb2f3d771966365b0 Mon Sep 17 00:00:00 2001 From: mirabilos Date: Thu, 1 Feb 2018 15:34:07 +0100 -Subject: [PATCH 2/4] Instead of doing preprocessor magic, just output off_t as +Subject: [PATCH] Instead of doing preprocessor magic, just output off_t as long long Fix warnings abot PRIdoff_t in libmtd.c, in mtd_read (and mtd_write): diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0003-Makefile.am-only-build-ubi-utils.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0003-Makefile.am-only-build-ubi-utils.patch index 08c53d18a3..38ab7a91cb 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0003-Makefile.am-only-build-ubi-utils.patch +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0003-Makefile.am-only-build-ubi-utils.patch @@ -1,7 +1,7 @@ From 139d93bc405272a3261d57be26da842e737fe4d0 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 28 Jan 2018 23:10:34 +0100 -Subject: [PATCH 3/4] Makefile.am: only build ubi-utils +Subject: [PATCH] Makefile.am: only build ubi-utils We only target the ubi-utils, static, small. diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch index 5da05fa48f..2844a5020c 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch @@ -1,7 +1,7 @@ From ae1cf6d0eb1833e46549328a4473222c259723d7 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 1 Feb 2018 00:25:00 +0100 -Subject: [PATCH 4/4] mtd-utils: common.h: no features.h for klibc builds +Subject: [PATCH] mtd-utils: common.h: no features.h for klibc builds Add guard around features.h to fix missing include (here first error): diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0005-common.h-replace-getline-with-fgets.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0005-common.h-replace-getline-with-fgets.patch index adef377b89..a556ed3d87 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0005-common.h-replace-getline-with-fgets.patch +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0005-common.h-replace-getline-with-fgets.patch @@ -1,7 +1,7 @@ From 2137eb1a6cd0326510bd3b9faf8037d9bf34ca3d Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Wed, 23 May 2018 15:52:34 +0200 -Subject: [PATCH 5/5] common.h: replace getline() with fgets +Subject: [PATCH] common.h: replace getline() with fgets There is an unofficial upstream patch adding a simple getline() to libmissing.h. Unfortunately the patch creates issues if the @@ -13,7 +13,7 @@ Fix: | ubi-utils/ubiformat.o: In function `prompt.constprop.4': | ubiformat.c:(.text+0x70): undefined reference to `getline' -Upstrea-Status: Inappropriate [klibc specific] +Upstream-Status: Inappropriate [klibc specific] Signed-off-by: Andrea Adami --- diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb index 8b00981236..0475cbeaee 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ inherit autotools pkgconfig klibc -SRCREV = "bc63d36e39f389c8c17f6a8e9db47f2acc884659" +SRCREV = "64f61a9dc71b158c7084006cbce4ea23886f0b47" SRC_URI = "git://git.infradead.org/mtd-utils.git \ file://0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch \ file://0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch \ -- cgit 1.2.3-korg