summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch12
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch57
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch21
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch30
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/arch_pm.patch19
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/noman.patch18
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.18.24.bb (renamed from meta/recipes-devtools/dpkg/dpkg_1.18.10.bb)6
7 files changed, 89 insertions, 74 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
index 231a6a2909..9fe0ca7600 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
@@ -13,13 +13,13 @@ Upstream-Status: Inappropriate [embedded specific]
13 1 file changed, 2 insertions(+), 4 deletions(-) 13 1 file changed, 2 insertions(+), 4 deletions(-)
14 14
15diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c 15diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c
16index 79b2908..7758aa5 100644 16index 453077fd9..f42ea2882 100644
17--- a/lib/dpkg/parsehelp.c 17--- a/lib/dpkg/parsehelp.c
18+++ b/lib/dpkg/parsehelp.c 18+++ b/lib/dpkg/parsehelp.c
19@@ -235,14 +235,12 @@ parseversion(struct dpkg_version *rversion, const char *string, 19@@ -243,14 +243,12 @@ parseversion(struct dpkg_version *rversion, const char *string,
20
21 /* XXX: Would be faster to use something like cisversion and cisrevision. */
22 ptr = rversion->version; 20 ptr = rversion->version;
21 if (!*ptr)
22 return dpkg_put_error(err, _("version number is empty"));
23- if (*ptr && !c_isdigit(*ptr++)) 23- if (*ptr && !c_isdigit(*ptr++))
24- return dpkg_put_warn(err, _("version number does not start with digit")); 24- return dpkg_put_warn(err, _("version number does not start with digit"));
25 for (; *ptr; ptr++) { 25 for (; *ptr; ptr++) {
@@ -33,6 +33,6 @@ index 79b2908..7758aa5 100644
33 return dpkg_put_warn(err, _("invalid character in revision number")); 33 return dpkg_put_warn(err, _("invalid character in revision number"));
34 } 34 }
35 35
36--
372.1.4
38 36
37--
382.11.0
diff --git a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
index a6b00880ce..d929466b70 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0006-add-musleabi-to-known-target-tripets.patch
@@ -6,37 +6,36 @@ Subject: [PATCH] add musleabi to known target tripets
6helps compiling dpkg for musl/arm-softfloat 6helps compiling dpkg for musl/arm-softfloat
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
9--- 10---
10Upstream-Status: Pending 11 data/ostable | 1 +
11 12 data/tupletable | 1 +
12 ostable | 1 +
13 triplettable | 1 +
14 2 files changed, 2 insertions(+) 13 2 files changed, 2 insertions(+)
15 14
16diff --git a/ostable b/ostable 15diff --git a/data/ostable b/data/ostable
17index 3bb6819..d0ffdc7 100644 16index 99c1f889d..be6434271 100644
18--- a/ostable 17--- a/data/ostable
19+++ b/ostable 18+++ b/data/ostable
20@@ -15,6 +15,7 @@ 19@@ -17,6 +17,7 @@
21 uclibceabi-linux linux-uclibceabi linux[^-]*-uclibceabi 20 eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi
22 uclibc-linux linux-uclibc linux[^-]*-uclibc 21 base-uclibc-linux linux-uclibc linux[^-]*-uclibc
23 musleabihf-linux linux-musleabihf linux[^-]*-musleabihf 22 eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf
24+musleabi-linux linux-musleabi linux[^-]*-musleabi 23+eabi-musl-linux linux-musleabi linux[^-]*-musleabi
25 musl-linux linux-musl linux[^-]*-musl 24 base-musl-linux linux-musl linux[^-]*-musl
26 gnueabihf-linux linux-gnueabihf linux[^-]*-gnueabihf 25 eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf
27 gnueabi-linux linux-gnueabi linux[^-]*-gnueabi 26 eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi
28diff --git a/triplettable b/triplettable 27diff --git a/data/tupletable b/data/tupletable
29index 1213584..70d24c1 100644 28index 5f500f6ca..28f00bfe6 100644
30--- a/triplettable 29--- a/data/tupletable
31+++ b/triplettable 30+++ b/data/tupletable
32@@ -6,6 +6,7 @@ 31@@ -8,6 +8,7 @@
33 uclibceabi-linux-arm uclibc-linux-armel 32 eabi-uclibc-linux-arm uclibc-linux-armel
34 uclibc-linux-<cpu> uclibc-linux-<cpu> 33 base-uclibc-linux-<cpu> uclibc-linux-<cpu>
35 musleabihf-linux-arm musl-linux-armhf 34 eabihf-musl-linux-arm musl-linux-armhf
36+musleabi-linux-arm musl-linux-armel 35+eabi-musl-linux-arm musl-linux-armel
37 musl-linux-<cpu> musl-linux-<cpu> 36 base-musl-linux-<cpu> musl-linux-<cpu>
38 gnueabihf-linux-arm armhf 37 ilp32-gnu-linux-arm64 arm64ilp32
39 gnueabi-linux-arm armel 38 eabihf-gnu-linux-arm armhf
40-- 39--
412.6.4 402.11.0
42 41
diff --git a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch
index 8bfaad14d8..1b985df0f5 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch
@@ -23,18 +23,17 @@ Upstream-Status: Inappropriate [Configuration]
23 1 file changed, 1 insertion(+), 1 deletion(-) 23 1 file changed, 1 insertion(+), 1 deletion(-)
24 24
25diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c 25diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
26index 655aa55..927f56f 100644 26index a92b58e..a3d1912 100644
27--- a/dpkg-deb/build.c 27--- a/dpkg-deb/build.c
28+++ b/dpkg-deb/build.c 28+++ b/dpkg-deb/build.c
29@@ -447,7 +447,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, 29@@ -450,7 +450,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
30 snprintf(mtime, sizeof(mtime), "@%ld", timestamp);
31 30
32 execlp(TAR, "tar", "-cf", "-", "--format=gnu", 31 command_init(&cmd, TAR, "tar -cf");
33- "--mtime", mtime, "--clamp-mtime", 32 command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu",
34+ "--mtime", mtime, 33- "--mtime", mtime, "--clamp-mtime", NULL);
35 "--null", "--no-unquote", 34+ "--mtime", mtime, NULL);
36 "--no-recursion", "-T", "-", NULL); 35 /* Mode might become a positional argument, pass it before -T. */
37 ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR); 36 if (mode)
37 command_add_args(&cmd, "--mode", mode, NULL);
38-- 38--
392.1.4 392.11.0
40
diff --git a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
index dc69eb2d1c..d165616a19 100644
--- a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch
@@ -24,23 +24,25 @@ empty in configure script.
24Upstream-Status: Pending 24Upstream-Status: Pending
25 25
26Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> 26Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com>
27Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
27 28
28--- 29---
29 triplettable | 1 + 30 data/tupletable | 1 +
30 1 file changed, 1 insertion(+) 31 1 file changed, 1 insertion(+)
31 32
32diff --git a/triplettable b/triplettable 33diff --git a/data/tupletable b/data/tupletable
33index abe4726..1e9c247 100644 34index b7802bec3..5f500f6ca 100644
34--- a/triplettable 35--- a/data/tupletable
35+++ b/triplettable 36+++ b/data/tupletable
36@@ -11,6 +11,7 @@ gnueabihf-linux-arm armhf 37@@ -12,6 +12,7 @@ base-musl-linux-<cpu> musl-linux-<cpu>
37 gnueabi-linux-arm armel 38 ilp32-gnu-linux-arm64 arm64ilp32
38 gnuabin32-linux-mips64r6el mipsn32r6el 39 eabihf-gnu-linux-arm armhf
39 gnuabin32-linux-mips64r6 mipsn32r6 40 eabi-gnu-linux-arm armel
40+gnueabi-linux-armeb armeb 41+eabi-gnu-linux-armeb armeb
41 gnuabin32-linux-mips64el mipsn32el 42 abin32-gnu-linux-mips64r6el mipsn32r6el
42 gnuabin32-linux-mips64 mipsn32 43 abin32-gnu-linux-mips64r6 mipsn32r6
43 gnuabi64-linux-mips64r6el mips64r6el 44 abin32-gnu-linux-mips64el mipsn32el
44-- 45--
452.1.4 462.11.0
47
46 48
diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
index cad4c0f0a1..4e0d22acbb 100644
--- a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch
@@ -7,16 +7,23 @@ Upstream-Status: Pending
7 7
8Signed-off-by: Joe Slater <jslater@windriver.com> 8Signed-off-by: Joe Slater <jslater@windriver.com>
9 9
10---
11 scripts/Dpkg/Arch.pm | 3 ---
12 1 file changed, 3 deletions(-)
10 13
14diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
15index 1720847b8..6345ce3b9 100644
11--- a/scripts/Dpkg/Arch.pm 16--- a/scripts/Dpkg/Arch.pm
12+++ b/scripts/Dpkg/Arch.pm 17+++ b/scripts/Dpkg/Arch.pm
13@@ -233,9 +233,6 @@ sub read_triplettable() 18@@ -323,9 +323,6 @@ sub _load_tupletable()
14 (my $dt = $debtriplet) =~ s/<cpu>/$_cpu/; 19 (my $dt = $debtuple) =~ s/<cpu>/$_cpu/;
15 (my $da = $debarch) =~ s/<cpu>/$_cpu/; 20 (my $da = $debarch) =~ s/<cpu>/$_cpu/;
16 21
17- next if exists $debarch_to_debtriplet{$da} 22- next if exists $debarch_to_debtuple{$da}
18- or exists $debtriplet_to_debarch{$dt}; 23- or exists $debtuple_to_debarch{$dt};
19- 24-
20 $debarch_to_debtriplet{$da} = $dt; 25 $debarch_to_debtuple{$da} = $dt;
21 $debtriplet_to_debarch{$dt} = $da; 26 $debtuple_to_debarch{$dt} = $da;
22 } 27 }
28--
292.11.0
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch
index d30c15018a..a7f3cb8f45 100644
--- a/meta/recipes-devtools/dpkg/dpkg/noman.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch
@@ -1,14 +1,22 @@
1Upstream-Status: Inappropriate [disable feature] 1Upstream-Status: Inappropriate [disable feature]
2 2
3diff -ruN dpkg-1.15.8.5-orig/Makefile.am dpkg-1.15.8.5/Makefile.am 3---
4--- dpkg-1.15.8.5-orig/Makefile.am 2010-10-08 12:27:15.042083703 +0800 4 Makefile.am | 3 +--
5+++ dpkg-1.15.8.5/Makefile.am 2010-10-08 12:27:27.755148228 +0800 5 1 file changed, 1 insertion(+), 2 deletions(-)
6@@ -12,8 +12,7 @@ 6
7 utils \ 7diff --git a/Makefile.am b/Makefile.am
8index 0da52cb16..a1f79e0a2 100644
9--- a/Makefile.am
10+++ b/Makefile.am
11@@ -13,8 +13,7 @@ SUBDIRS = \
8 $(MAYBE_DSELECT) \ 12 $(MAYBE_DSELECT) \
9 scripts \ 13 scripts \
14 t-func \
10- po \ 15- po \
11- man 16- man
12+ po 17+ po
13 18
14 ACLOCAL_AMFLAGS = -I m4 19 ACLOCAL_AMFLAGS = -I m4
20
21--
222.11.0
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.18.10.bb b/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb
index 21385af878..f06b604ebb 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.18.10.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.18.24.bb
@@ -1,7 +1,7 @@
1require dpkg.inc 1require dpkg.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
3 3
4SRC_URI = "http://snapshot.debian.org/archive/debian/20160731T221931Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz \ 4SRC_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/${BPN}_${PV}.tar.xz \
5 file://noman.patch \ 5 file://noman.patch \
6 file://remove-tar-no-timestamp.patch \ 6 file://remove-tar-no-timestamp.patch \
7 file://arch_pm.patch \ 7 file://arch_pm.patch \
@@ -16,5 +16,5 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160731T221931Z/pool/main/
16 " 16 "
17SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch " 17SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch "
18 18
19SRC_URI[md5sum] = "ccff17730c0964428fc186ded2f2f401" 19SRC_URI[md5sum] = "02e8af8faf1e689228da806c3e8c6882"
20SRC_URI[sha256sum] = "025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5" 20SRC_URI[sha256sum] = "d853081d3e06bfd46a227056e591f094e42e78fa8a5793b0093bad30b710d7b4"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-04 21:57:56 +0000