diff options
Diffstat (limited to 'meta/recipes-devtools/dpkg')
17 files changed, 120 insertions, 241 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index b6807b004f..4c1d42e0af 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -1,21 +1,21 @@ SUMMARY = "Package maintenance system from Debian" -LICENSE = "GPLv2.0+" +LICENSE = "GPL-2.0-or-later" HOMEPAGE = "https://salsa.debian.org/dpkg-team/dpkg" DESCRIPTION = "The primary interface for the dpkg suite is the dselect program. A more low-level and less user-friendly interface is available in the form of the dpkg command." SECTION = "base" -DEPENDS = "zlib bzip2 perl ncurses" -DEPENDS:class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native" +DEPENDS = "zlib bzip2 perl ncurses libmd" +DEPENDS:class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native libmd-native" RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_update-alternatives} perl" RDEPENDS:${PN}:class-native = "" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" -inherit autotools gettext perlnative pkgconfig perl-version update-alternatives +inherit autotools gettext perlnative pkgconfig perl-version update-alternatives bash-completion PERL:class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" -export PERL_LIBDIR = "${libdir}/perl/${@get_perl_version(d)}" +export PERL_LIBDIR = "${libdir}/perl5/${@get_perl_version(d)}" PERL_LIBDIR:class-native = "${libdir}/perl-native/perl/${@get_perl_version(d)}" EXTRA_OECONF = "\ @@ -49,9 +49,9 @@ do_install:append () { if [ "${PN}" = "dpkg-native" ]; then # update-alternatives doesn't have an offline mode rm ${D}${bindir}/update-alternatives - sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-* + sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-* ${D}${sbindir}/dpkg-* else - sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* + sed -i -e 's|^#!.*${STAGING_BINDIR_NATIVE}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* ${D}${sbindir}/dpkg-* fi } @@ -61,12 +61,14 @@ PROV:class-nativesdk = "" PROVIDES += "${PROV}" +FILES:${PN} += "${datadir}/zsh" + PACKAGES =+ "update-alternatives-dpkg" FILES:update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" RPROVIDES:update-alternatives-dpkg += "update-alternatives" PACKAGES += "${PN}-perl" -FILES:${PN}-perl = "${libdir}/perl/${@get_perl_version(d)}" +FILES:${PN}-perl = "${libdir}/perl5/${@get_perl_version(d)}" RDEPENDS:${PN}-perl += "perl-module-carp perl-module-constant \ perl-module-cwd perl-module-digest \ diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch b/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch index 52e85705fa..b8a8697585 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-Add-support-for-riscv32-CPU.patch @@ -1,4 +1,4 @@ -From 279e4c274f5f295823cf9fa95d3ba131f6d711db Mon Sep 17 00:00:00 2001 +From 21459bb8d9a997e6a92885a4ef337ede9cc5aba7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 29 Apr 2020 22:02:23 -0700 Subject: [PATCH] Add support for riscv32 CPU @@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+) diff --git a/data/cputable b/data/cputable -index 9f2a8e0..1d935b1 100644 +index 575c008e3..7a801a03a 100644 --- a/data/cputable +++ b/data/cputable -@@ -41,6 +41,7 @@ powerpc powerpc (powerpc|ppc) 32 big +@@ -43,6 +43,7 @@ powerpc powerpc (powerpc|ppc) 32 big powerpcel powerpcle powerpcle 32 little ppc64 powerpc64 (powerpc|ppc)64 64 big ppc64el powerpc64le powerpc64le 64 little @@ -23,10 +23,10 @@ index 9f2a8e0..1d935b1 100644 s390 s390 s390 32 big s390x s390x s390x 64 big diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm -index a352bbd..fa1d90b 100644 +index fcf5b1e2a..175c9f436 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm -@@ -306,6 +306,7 @@ sub _add_build_flags { +@@ -202,6 +202,7 @@ sub set_build_features { powerpc ppc64 ppc64el @@ -34,6 +34,3 @@ index a352bbd..fa1d90b 100644 riscv64 s390x sparc --- -2.26.2 - diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch index 2dc68e2064..95a49053e8 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch @@ -1,4 +1,4 @@ -From d6f5fed6bc56e1f3b885a796a43aa2868ace57bc Mon Sep 17 00:00:00 2001 +From 4c5e6c280a2ab4d2009d3264e94286f5fe244d0b Mon Sep 17 00:00:00 2001 From: Paul Eggleton <paul.eggleton@linux.microsoft.com> Date: Tue, 16 Jun 2020 03:57:25 +0000 Subject: [PATCH] build.c: ignore return of 1 from tar -cf @@ -23,16 +23,15 @@ Upstream-Status: Inappropriate [OE specific] Original patch by RP 2015/3/27, rebased by Paul Eggleton Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com> - --- - dpkg-deb/build.c | 5 ++++- + src/deb/build.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c -index d13a21c1e..059f2be6d 100644 ---- a/dpkg-deb/build.c -+++ b/dpkg-deb/build.c -@@ -480,6 +480,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, +diff --git a/src/deb/build.c b/src/deb/build.c +index 92aba9553..6436b33da 100644 +--- a/src/deb/build.c ++++ b/src/deb/build.c +@@ -481,6 +481,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, { int pipe_filenames[2], pipe_tarball[2]; pid_t pid_tar, pid_comp; @@ -40,7 +39,7 @@ index d13a21c1e..059f2be6d 100644 /* Fork off a tar. We will feed it a list of filenames on stdin later. */ m_pipe(pipe_filenames); -@@ -532,7 +533,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, +@@ -533,7 +534,9 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, /* All done, clean up wait for tar and <compress> to finish their job. */ close(pipe_filenames[1]); subproc_reap(pid_comp, _("<compress> from tar -cf"), 0); diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch index 50e6894406..e8d8576f85 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0001-dpkg-Support-muslx32-build.patch @@ -1,9 +1,9 @@ -From a328c8bec0bf8071ae8f20fee4c7475205064ba1 Mon Sep 17 00:00:00 2001 +From 1d192b60fc43e24e1c2d6ff452dabeee7a227cc0 Mon Sep 17 00:00:00 2001 From: sweeaun <swee.aun.khor@intel.com> Date: Sun, 10 Sep 2017 00:14:15 -0700 Subject: [PATCH] dpkg: Support muslx32 build -Upstream-Status: Pending. +Upstream-Status: Pending Changes made on ostable and tupletable to enable muslx32 build. Signed-off-by: sweeaun <swee.aun.khor@intel.com> @@ -13,10 +13,10 @@ Signed-off-by: sweeaun <swee.aun.khor@intel.com> 2 files changed, 2 insertions(+) diff --git a/data/ostable b/data/ostable -index be64342..87db273 100644 +index 860355774..28779beca 100644 --- a/data/ostable +++ b/data/ostable -@@ -19,6 +19,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc +@@ -21,6 +21,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf eabi-musl-linux linux-musleabi linux[^-]*-musleabi base-musl-linux linux-musl linux[^-]*-musl @@ -25,17 +25,14 @@ index be64342..87db273 100644 eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi abin32-gnu-linux linux-gnuabin32 linux[^-]*-gnuabin32 diff --git a/data/tupletable b/data/tupletable -index 28f00bf..748ffab 100644 +index 82ae3604e..707d85bdb 100644 --- a/data/tupletable +++ b/data/tupletable -@@ -10,6 +10,7 @@ base-uclibc-linux-<cpu> uclibc-linux-<cpu> +@@ -26,6 +26,7 @@ base-uclibc-linux-<cpu> uclibc-linux-<cpu> eabihf-musl-linux-arm musl-linux-armhf eabi-musl-linux-arm musl-linux-armel base-musl-linux-<cpu> musl-linux-<cpu> +x32-musl-linux-amd64 x32 - ilp32-gnu-linux-arm64 arm64ilp32 eabihf-gnu-linux-arm armhf eabi-gnu-linux-arm armel --- -2.7.4 - + eabi-gnu-linux-armeb armeb 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 9fe0ca7600..fc097e5a66 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 @@ -1,8 +1,8 @@ -From b4ea54158c399874e12394ebc91afe98954695e2 Mon Sep 17 00:00:00 2001 +From 0cac67ce5920d6d0c9df4278bfa77da878a8a37a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 26 Aug 2015 16:16:16 +0300 -Subject: [PATCH 2/5] Adapt to linux-wrs kernel version, which has character - '_' inside. Remove the first-char-digit-check (as the 1.15.8.5 version does). +Subject: [PATCH] Adapt to linux-wrs kernel version, which has character '_' + inside. Remove the first-char-digit-check (as the 1.15.8.5 version does). Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Constantin Musca <constantinx.musca@intel.com> @@ -13,14 +13,14 @@ Upstream-Status: Inappropriate [embedded specific] 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c -index 453077fd9..f42ea2882 100644 +index 63a36f55c..81901bd5a 100644 --- a/lib/dpkg/parsehelp.c +++ b/lib/dpkg/parsehelp.c -@@ -243,14 +243,12 @@ parseversion(struct dpkg_version *rversion, const char *string, +@@ -275,14 +275,12 @@ parseversion(struct dpkg_version *rversion, const char *string, ptr = rversion->version; if (!*ptr) return dpkg_put_error(err, _("version number is empty")); -- if (*ptr && !c_isdigit(*ptr++)) +- if (!c_isdigit(*ptr++)) - return dpkg_put_warn(err, _("version number does not start with digit")); for (; *ptr; ptr++) { - if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:", *ptr) == NULL) @@ -33,6 +33,3 @@ index 453077fd9..f42ea2882 100644 return dpkg_put_warn(err, _("invalid character in revision number")); } - --- -2.11.0 diff --git a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch index 9ca7262eb9..916c7dfb00 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch @@ -1,4 +1,4 @@ -From dd11ed66640f79143e42d778b58fdd5a61fb5836 Mon Sep 17 00:00:00 2001 +From b6c28222276704a1e1a544983e38dfa2f3fb481a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 26 Aug 2015 16:25:45 +0300 Subject: [PATCH] Our pre/postinsts expect $D to be set when running in a @@ -12,21 +12,21 @@ ALIMON 2016/05/26 ALIMON 2017/02/21 KKang 2019/02/20 --- - src/script.c | 53 +++------------------------------------------------- + src/main/script.c | 53 +++-------------------------------------------- 1 file changed, 3 insertions(+), 50 deletions(-) -diff --git a/src/script.c b/src/script.c -index abe65b6f7..621ff9b27 100644 ---- a/src/script.c -+++ b/src/script.c -@@ -96,58 +96,11 @@ setexecute(const char *path, struct stat *stab) - static const char * +diff --git a/src/main/script.c b/src/main/script.c +index 017d92efe..181e7c710 100644 +--- a/src/main/script.c ++++ b/src/main/script.c +@@ -97,58 +97,11 @@ static const char * maintscript_pre_exec(struct command *cmd) { + const char *instdir = dpkg_fsys_get_dir(); - const char *admindir = dpkg_db_get_dir(); - const char *changedir; - size_t instdirlen = strlen(instdir); -- + - if (instdirlen > 0 && in_force(FORCE_SCRIPT_CHROOTLESS)) - changedir = instdir; - else @@ -49,9 +49,7 @@ index abe65b6f7..621ff9b27 100644 - "using --force-script-chrootless?")); - else if (rc) - ohshite(_("failed to chroot to '%.250s'"), instdir); -+ if (*instdir) { -+ setenv("D", instdir, 1); - } +- } - /* Switch to a known good directory to give the maintainer script - * a saner environment, also needed after the chroot(). */ - if (chdir(changedir)) @@ -68,19 +66,18 @@ index abe65b6f7..621ff9b27 100644 - debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, - args.buf); - varbuf_destroy(&args); -- } ++ if (*instdir) { ++ setenv("D", instdir, 1); + } - if (instdirlen == 0 || in_force(FORCE_SCRIPT_CHROOTLESS)) - return cmd->filename; - - if (strlen(cmd->filename) < instdirlen) - internerr("maintscript name '%s' length < instdir length %zd", - cmd->filename, instdirlen); - +- - return cmd->filename + instdirlen; + return cmd->filename; } /** --- -2.17.1 - diff --git a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch index 56c85c7733..35c0c246f6 100644 --- a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch +++ b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch @@ -1,21 +1,20 @@ -From adb6bfd0feeceaf030df0debe3343d7f73e708a0 Mon Sep 17 00:00:00 2001 +From 80ad29d22f8ca4033a6a79a726580fee17bdade9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Wed, 26 Aug 2015 16:27:45 +0300 -Subject: [PATCH 4/5] The lutimes function doesn't work properly for all - systems. +Subject: [PATCH] The lutimes function doesn't work properly for all systems. Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Upstream-Status: Inappropriate [embedded specific] --- - src/archives.c | 3 ++- + src/main/archives.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/archives.c b/src/archives.c -index bff5f14..b711013 100644 ---- a/src/archives.c -+++ b/src/archives.c -@@ -449,8 +449,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) +diff --git a/src/main/archives.c b/src/main/archives.c +index 7e399f922..ec3b6878f 100644 +--- a/src/main/archives.c ++++ b/src/main/archives.c +@@ -491,8 +491,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) if (te->type == TAR_FILETYPE_SYMLINK) { #ifdef HAVE_LUTIMES @@ -26,6 +25,3 @@ index bff5f14..b711013 100644 #endif } else { if (utimes(path, tv)) --- -2.1.4 - 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 8797ea55c6..8ac646b1a1 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 @@ -1,7 +1,10 @@ -From f8910022dc3ec622272f168cd0022dbdf6dff93a Mon Sep 17 00:00:00 2001 +From 1c9e78dda91ba66fbd8fe02b66b6c603d08d3343 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 30 Dec 2015 23:05:41 +0000 Subject: [PATCH] add musleabi to known target tripets +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit helps compiling dpkg for musl/arm-softfloat @@ -14,10 +17,10 @@ Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> 2 files changed, 2 insertions(+) diff --git a/data/ostable b/data/ostable -index 99c1f889d..be6434271 100644 +index 64f424490..860355774 100644 --- a/data/ostable +++ b/data/ostable -@@ -17,6 +17,7 @@ +@@ -19,6 +19,7 @@ eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi base-uclibc-linux linux-uclibc linux[^-]*-uclibc eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf @@ -26,17 +29,14 @@ index 99c1f889d..be6434271 100644 eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi diff --git a/data/tupletable b/data/tupletable -index 5f500f6ca..28f00bfe6 100644 +index 7436f8056..82ae3604e 100644 --- a/data/tupletable +++ b/data/tupletable -@@ -8,6 +8,7 @@ +@@ -24,6 +24,7 @@ eabi-uclibc-linux-arm uclibc-linux-armel base-uclibc-linux-<cpu> uclibc-linux-<cpu> eabihf-musl-linux-arm musl-linux-armhf +eabi-musl-linux-arm musl-linux-armel base-musl-linux-<cpu> musl-linux-<cpu> - ilp32-gnu-linux-arm64 arm64ilp32 eabihf-gnu-linux-arm armhf --- -2.11.0 - + eabi-gnu-linux-arm armel 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 4f79a40d8b..3d3a4f0bb9 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 @@ -1,4 +1,4 @@ -From 8659eeeeda74d71e12080121f0b13a88cbdda433 Mon Sep 17 00:00:00 2001 +From 6dd80236a91a505b5753bb74e5f1b47330d8b16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> Date: Tue, 21 Feb 2017 11:23:27 -0600 Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar @@ -23,14 +23,14 @@ Update patch context for dpkg 1.19.4. Signed-off-by: Kai Kang <kai.kang@windriver.com> --- - dpkg-deb/build.c | 2 +- + src/deb/build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c -index 68d1875..053fcb7 100644 ---- a/dpkg-deb/build.c -+++ b/dpkg-deb/build.c -@@ -457,7 +457,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, +diff --git a/src/deb/build.c b/src/deb/build.c +index 1f0c050ee..92aba9553 100644 +--- a/src/deb/build.c ++++ b/src/deb/build.c +@@ -504,7 +504,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, command_init(&cmd, TAR, "tar -cf"); command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu", @@ -39,5 +39,3 @@ index 68d1875..053fcb7 100644 /* Mode might become a positional argument, pass it before -T. */ if (options->mode) command_add_args(&cmd, "--mode", options->mode, NULL); --- -2.11.0 diff --git a/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch b/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch deleted file mode 100644 index 292b72ab5d..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0decc62904571582147f2273fa1b521e00485dda Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 3 Feb 2021 20:47:58 +0100 -Subject: [PATCH] scripts/dpkg-fsys-usrunmess.pl: correct shebang - -Otherwise automake will write the full native perl path into it. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - scripts/dpkg-fsys-usrunmess.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/dpkg-fsys-usrunmess.pl b/scripts/dpkg-fsys-usrunmess.pl -index 9220df3c0..9ce368955 100755 ---- a/scripts/dpkg-fsys-usrunmess.pl -+++ b/scripts/dpkg-fsys-usrunmess.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/usr/bin/env perl - # - # dpkg-fsys-usrunmess - Undoes the merged-/usr-via-aliased-dirs mess - # diff --git a/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch b/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch deleted file mode 100644 index ece18a33ac..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c6acfba64b470c7e919fd5bd29124d7228492537 Mon Sep 17 00:00:00 2001 -From: Guillem Jover <guillem@debian.org> -Date: Fri, 28 May 2021 04:07:49 +0200 -Subject: [PATCH] arch: Add support for ARCv2 CPU - -This is based on the ARCv2 32-bit little-endian hard-float ISA. - -Closes: #980963 - -Upstream-Status: Backport [https://salsa.debian.org/dpkg-team/dpkg/-/commit/0d134cdcb0dcc6b21fa7926964c1426a5821181d] - -Based-on-patch-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com> -Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com> ---- - data/cputable | 1 + - scripts/Dpkg/Shlibs/Objdump.pm | 1 + - scripts/t/Dpkg_Arch.t | 4 ++-- - 3 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/data/cputable b/data/cputable -index 9f2a8e0e4..277bed88f 100644 ---- a/data/cputable -+++ b/data/cputable -@@ -20,6 +20,7 @@ i386 i686 (i[34567]86|pentium) 32 little - ia64 ia64 ia64 64 little - alpha alpha alpha.* 64 little - amd64 x86_64 (amd64|x86_64) 64 little -+arc arc arc 32 little - armeb armeb arm.*b 32 big - arm arm arm.* 32 little - arm64 aarch64 aarch64 64 little -diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm -index 4cee866e7..93319d1eb 100644 ---- a/scripts/Dpkg/Shlibs/Objdump.pm -+++ b/scripts/Dpkg/Shlibs/Objdump.pm -@@ -100,6 +100,7 @@ use constant { - ELF_MACH_OR1K => 92, - ELF_MACH_XTENSA => 94, - ELF_MACH_MICROBLAZE => 189, -+ ELF_MACH_ARCV2 => 195, - ELF_MACH_AVR_OLD => 0x1057, - ELF_MACH_OR1K_OLD => 0x8472, - ELF_MACH_ALPHA => 0x9026, -diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t -index a3a9e6fee..f0bba272a 100644 ---- a/scripts/t/Dpkg_Arch.t -+++ b/scripts/t/Dpkg_Arch.t -@@ -16,7 +16,7 @@ - use strict; - use warnings; - --use Test::More tests => 16836; -+use Test::More tests => 18407; - - use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch - debarch_eq debarch_is debarch_is_wildcard -@@ -174,7 +174,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet'); - is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown gnutriplet'); - is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet'); - --is(scalar get_valid_arches(), 539, 'expected amount of known architectures'); -+is(scalar get_valid_arches(), 554, 'expected amount of known architectures'); - - { - local $ENV{CC} = 'false'; --- -2.16.2 - 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 d165616a19..cbdf01dbd9 100644 --- a/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch +++ b/meta/recipes-devtools/dpkg/dpkg/add_armeb_triplet_entry.patch @@ -1,5 +1,11 @@ -Author: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> -Date: Wed Apr 8 18:08:14 2015 +0530 +From 1c3a109df54b6092fa85a1fe2b7771e3b959655f Mon Sep 17 00:00:00 2001 +From: "Krishnanjanappa, Jagadeesh" + <jagadeesh.krishnanjanappa@caviumnetworks.com> +Date: Wed, 8 Apr 2015 18:08:14 +0530 +Subject: [PATCH] dpkg: add triplet entry to fix build error for armeb +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit [PATCH] add armeb triplet entry into triplettable. @@ -25,24 +31,19 @@ Upstream-Status: Pending Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> - --- data/tupletable | 1 + 1 file changed, 1 insertion(+) diff --git a/data/tupletable b/data/tupletable -index b7802bec3..5f500f6ca 100644 +index ae9f2ddb4..7436f8056 100644 --- a/data/tupletable +++ b/data/tupletable -@@ -12,6 +12,7 @@ base-musl-linux-<cpu> musl-linux-<cpu> - ilp32-gnu-linux-arm64 arm64ilp32 +@@ -27,6 +27,7 @@ eabihf-musl-linux-arm musl-linux-armhf + base-musl-linux-<cpu> musl-linux-<cpu> eabihf-gnu-linux-arm armhf eabi-gnu-linux-arm armel +eabi-gnu-linux-armeb armeb abin32-gnu-linux-mips64r6el mipsn32r6el abin32-gnu-linux-mips64r6 mipsn32r6 abin32-gnu-linux-mips64el mipsn32el --- -2.11.0 - - diff --git a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch index 4e0d22acbb..df2cd88ca4 100644 --- a/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch +++ b/meta/recipes-devtools/dpkg/dpkg/arch_pm.patch @@ -1,3 +1,8 @@ +From bdf60ebbeb433a80e6cfcbde9d83d89564e79e20 Mon Sep 17 00:00:00 2001 +From: Joe Slater <jslater@windriver.com> +Date: Mon, 26 Aug 2013 23:38:45 +0000 +Subject: [PATCH] dpkg: fix configuration issue for mips64 + configure cannot determine the proper cpu, os, or architecture for mips64, and possibly other arch's because of faulty code added to Arch.pm in the latest @@ -6,16 +11,15 @@ release from upstream. We remove that code. Upstream-Status: Pending Signed-off-by: Joe Slater <jslater@windriver.com> - --- scripts/Dpkg/Arch.pm | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm -index 1720847b8..6345ce3b9 100644 +index 0d352eeb9..4ef5fa307 100644 --- a/scripts/Dpkg/Arch.pm +++ b/scripts/Dpkg/Arch.pm -@@ -323,9 +323,6 @@ sub _load_tupletable() +@@ -326,9 +326,6 @@ sub _load_tupletable() (my $dt = $debtuple) =~ s/<cpu>/$_cpu/; (my $da = $debarch) =~ s/<cpu>/$_cpu/; @@ -25,5 +29,3 @@ index 1720847b8..6345ce3b9 100644 $debarch_to_debtuple{$da} = $dt; $debtuple_to_debarch{$dt} = $da; } --- -2.11.0 diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch index a7f3cb8f45..e80549d740 100644 --- a/meta/recipes-devtools/dpkg/dpkg/noman.patch +++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch @@ -1,22 +1,22 @@ -Upstream-Status: Inappropriate [disable feature] +From 008ec5150dd086ffa3940cb520f1ca91939f138d Mon Sep 17 00:00:00 2001 +From: Chris Larson <kergoth@openedhand.com> +Date: Tue, 5 Sep 2006 07:24:58 +0000 +Subject: [PATCH] Add dpkg, modified from upstream oe. +Upstream-Status: Inappropriate [disable feature] --- - Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) + Makefile.am | 1 - + 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 0da52cb16..a1f79e0a2 100644 +index 7186045d4..daca9faf2 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -13,8 +13,7 @@ SUBDIRS = \ +@@ -11,7 +11,6 @@ SUBDIRS = \ $(MAYBE_DSELECT) \ scripts \ - t-func \ -- po \ -- man -+ po + po \ +- man \ + # EOL ACLOCAL_AMFLAGS = -I m4 - --- -2.11.0 diff --git a/meta/recipes-devtools/dpkg/dpkg/pager.patch b/meta/recipes-devtools/dpkg/dpkg/pager.patch deleted file mode 100644 index e56b9d28af..0000000000 --- a/meta/recipes-devtools/dpkg/dpkg/pager.patch +++ /dev/null @@ -1,21 +0,0 @@ -pager: Use less instead of pager - -pager is a Debianism. Istead use directly pager. - -Upstream-Status: Inappropriate [OE-Core integration specific] - -Suggested-by: Burton, Ross <ross.burton@intel.com> -Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> -diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h -index 2bb067a..6cbce80 100644 ---- a/lib/dpkg/dpkg.h -+++ b/lib/dpkg/dpkg.h -@@ -95,7 +95,7 @@ DPKG_BEGIN_DECLS - #define MAXUPDATES 250 - - #define DEFAULTSHELL "sh" --#define DEFAULTPAGER "pager" -+#define DEFAULTPAGER "less" - - #define MD5HASHLEN 32 - #define MAXTRIGDIRECTIVE 256 diff --git a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch index 4f408ff777..9307725e8b 100644 --- a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch +++ b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch @@ -1,13 +1,21 @@ -busybox-1.19.4 tar utility doesn't support --warning=no-timestamp +From add92699ca1397205e1d7b46c3ab43de06b9a6c7 Mon Sep 17 00:00:00 2001 +From: Constantin Musca <constantinx.musca@intel.com> +Date: Tue, 28 Aug 2012 17:02:40 +0300 +Subject: [PATCH] busybox-1.19.4 tar utility doesn't support + --warning=no-timestamp Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Upstream-Status: Inappropriate [configuration] -Index: dpkg-1.17.1/dpkg-deb/extract.c -=================================================================== ---- dpkg-1.17.1.orig/dpkg-deb/extract.c -+++ dpkg-1.17.1/dpkg-deb/extract.c -@@ -318,7 +318,6 @@ extracthalf(const char *debar, const cha +--- + src/deb/extract.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/deb/extract.c b/src/deb/extract.c +index 8b78a7eab..fd7595808 100644 +--- a/src/deb/extract.c ++++ b/src/deb/extract.c +@@ -338,7 +338,6 @@ extracthalf(const char *debar, const char *dir, command_add_arg(&cmd, "-f"); command_add_arg(&cmd, "-"); diff --git a/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb b/meta/recipes-devtools/dpkg/dpkg_1.22.6.bb index 34b6bfe0a8..3f5f7395e0 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.22.6.bb @@ -1,7 +1,7 @@ require dpkg.inc LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20.x \ +SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main \ file://noman.patch \ file://remove-tar-no-timestamp.patch \ file://arch_pm.patch \ @@ -12,14 +12,11 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20. file://0006-add-musleabi-to-known-target-tripets.patch \ file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ file://0001-dpkg-Support-muslx32-build.patch \ - file://pager.patch \ file://0001-Add-support-for-riscv32-CPU.patch \ - file://0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch \ - file://0014-arch-Add-support-for-ARCv2-CPU.patch \ " SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" -SRCREV = "2177b782b16e77e97c9643961a5ae3c639bcc4a3" +SRCREV = "b2f9600ead232a2dd3c27f8b52807a9ca5854d17" S = "${WORKDIR}/git" |