diff options
Diffstat (limited to 'meta-initramfs/recipes-devtools')
6 files changed, 7 insertions, 7 deletions
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 6ed167f38..4ee9bd9a1 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: | |||
12 | | ../git/include/libmissing.h:7:10: fatal error: execinfo.h: | 12 | | ../git/include/libmissing.h:7:10: fatal error: execinfo.h: |
13 | No such file or directory | 13 | No such file or directory |
14 | 14 | ||
15 | Status: Inappropriate [klibc specific] | 15 | Upstream-Status: Inappropriate [klibc specific] |
16 | 16 | ||
17 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | 17 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
18 | --- | 18 | --- |
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 bb675a7be..5c6e09749 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 @@ | |||
1 | From 01c98d5d5d044d9a125abcdbb2f3d771966365b0 Mon Sep 17 00:00:00 2001 | 1 | From 01c98d5d5d044d9a125abcdbb2f3d771966365b0 Mon Sep 17 00:00:00 2001 |
2 | From: mirabilos <m@mirbsd.org> | 2 | From: mirabilos <m@mirbsd.org> |
3 | Date: Thu, 1 Feb 2018 15:34:07 +0100 | 3 | Date: Thu, 1 Feb 2018 15:34:07 +0100 |
4 | Subject: [PATCH 2/4] Instead of doing preprocessor magic, just output off_t as | 4 | Subject: [PATCH] Instead of doing preprocessor magic, just output off_t as |
5 | long long | 5 | long long |
6 | 6 | ||
7 | Fix warnings abot PRIdoff_t in libmtd.c, in mtd_read (and mtd_write): | 7 | 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 08c53d18a..38ab7a91c 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 @@ | |||
1 | From 139d93bc405272a3261d57be26da842e737fe4d0 Mon Sep 17 00:00:00 2001 | 1 | From 139d93bc405272a3261d57be26da842e737fe4d0 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Sun, 28 Jan 2018 23:10:34 +0100 | 3 | Date: Sun, 28 Jan 2018 23:10:34 +0100 |
4 | Subject: [PATCH 3/4] Makefile.am: only build ubi-utils | 4 | Subject: [PATCH] Makefile.am: only build ubi-utils |
5 | 5 | ||
6 | We only target the ubi-utils, static, small. | 6 | We only target the ubi-utils, static, small. |
7 | 7 | ||
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 5da05fa48..2844a5020 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 @@ | |||
1 | From ae1cf6d0eb1833e46549328a4473222c259723d7 Mon Sep 17 00:00:00 2001 | 1 | From ae1cf6d0eb1833e46549328a4473222c259723d7 Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Thu, 1 Feb 2018 00:25:00 +0100 | 3 | Date: Thu, 1 Feb 2018 00:25:00 +0100 |
4 | Subject: [PATCH 4/4] mtd-utils: common.h: no features.h for klibc builds | 4 | Subject: [PATCH] mtd-utils: common.h: no features.h for klibc builds |
5 | 5 | ||
6 | Add guard around features.h to fix missing include (here first error): | 6 | Add guard around features.h to fix missing include (here first error): |
7 | 7 | ||
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 adef377b8..a556ed3d8 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 @@ | |||
1 | From 2137eb1a6cd0326510bd3b9faf8037d9bf34ca3d Mon Sep 17 00:00:00 2001 | 1 | From 2137eb1a6cd0326510bd3b9faf8037d9bf34ca3d Mon Sep 17 00:00:00 2001 |
2 | From: Andrea Adami <andrea.adami@gmail.com> | 2 | From: Andrea Adami <andrea.adami@gmail.com> |
3 | Date: Wed, 23 May 2018 15:52:34 +0200 | 3 | Date: Wed, 23 May 2018 15:52:34 +0200 |
4 | Subject: [PATCH 5/5] common.h: replace getline() with fgets | 4 | Subject: [PATCH] common.h: replace getline() with fgets |
5 | 5 | ||
6 | There is an unofficial upstream patch adding a simple getline() | 6 | There is an unofficial upstream patch adding a simple getline() |
7 | to libmissing.h. Unfortunately the patch creates issues if the | 7 | to libmissing.h. Unfortunately the patch creates issues if the |
@@ -13,7 +13,7 @@ Fix: | |||
13 | | ubi-utils/ubiformat.o: In function `prompt.constprop.4': | 13 | | ubi-utils/ubiformat.o: In function `prompt.constprop.4': |
14 | | ubiformat.c:(.text+0x70): undefined reference to `getline' | 14 | | ubiformat.c:(.text+0x70): undefined reference to `getline' |
15 | 15 | ||
16 | Upstrea-Status: Inappropriate [klibc specific] | 16 | Upstream-Status: Inappropriate [klibc specific] |
17 | 17 | ||
18 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> | 18 | Signed-off-by: Andrea Adami <andrea.adami@gmail.com> |
19 | --- | 19 | --- |
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 8b0098123..0475cbeae 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 \ | |||
9 | 9 | ||
10 | inherit autotools pkgconfig klibc | 10 | inherit autotools pkgconfig klibc |
11 | 11 | ||
12 | SRCREV = "bc63d36e39f389c8c17f6a8e9db47f2acc884659" | 12 | SRCREV = "64f61a9dc71b158c7084006cbce4ea23886f0b47" |
13 | SRC_URI = "git://git.infradead.org/mtd-utils.git \ | 13 | SRC_URI = "git://git.infradead.org/mtd-utils.git \ |
14 | file://0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch \ | 14 | file://0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch \ |
15 | file://0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch \ | 15 | file://0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch \ |