diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-22 10:20:12 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-23 22:35:00 +0000 |
commit | bb10e0c726d4a9b09af7dda4baf339099ef62fe3 (patch) | |
tree | 87dee04be176b1120cbce9eecf60bbb7eec02a24 /meta/recipes-devtools/apt/apt_1.8.2.2.bb | |
parent | fdcdd64edd7b4e2f30cfa584f4415c86e7064b3c (diff) | |
download | poky-bb10e0c726d4a9b09af7dda4baf339099ef62fe3.tar.gz |
apt: Upgrade 1.8.2.1 -> 1.8.2.2
(From OE-Core rev: 9c04f9dca26eabdf71a432492d4b718805fda8f0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt_1.8.2.2.bb')
-rw-r--r-- | meta/recipes-devtools/apt/apt_1.8.2.2.bb | 130 |
1 files changed, 130 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt_1.8.2.2.bb b/meta/recipes-devtools/apt/apt_1.8.2.2.bb new file mode 100644 index 0000000000..6c5633c91f --- /dev/null +++ b/meta/recipes-devtools/apt/apt_1.8.2.2.bb | |||
@@ -0,0 +1,130 @@ | |||
1 | SUMMARY = "Advanced front-end for dpkg" | ||
2 | LICENSE = "GPLv2.0+" | ||
3 | SECTION = "base" | ||
4 | |||
5 | # Triehash script taken from https://github.com/julian-klode/triehash | ||
6 | SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ | ||
7 | file://triehash \ | ||
8 | file://0001-Disable-documentation-directory-altogether.patch \ | ||
9 | file://0001-Fix-musl-build.patch \ | ||
10 | file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \ | ||
11 | file://0001-test-libapt-do-not-use-gtest-from-the-host.patch \ | ||
12 | " | ||
13 | |||
14 | SRC_URI_append_class-native = " \ | ||
15 | file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ | ||
16 | file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ | ||
17 | file://0001-Do-not-configure-packages-on-installation.patch \ | ||
18 | " | ||
19 | |||
20 | SRC_URI_append_class-nativesdk = " \ | ||
21 | file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ | ||
22 | file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ | ||
23 | file://0001-Do-not-configure-packages-on-installation.patch \ | ||
24 | " | ||
25 | |||
26 | SRC_URI[sha256sum] = "f5030de22a5cc80db6fe0d42373b5df25d7dc56e94d9155f2eaa80dbd65e82fa" | ||
27 | LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
28 | |||
29 | # the package is taken from snapshots.debian.org; that source is static and goes stale | ||
30 | # so we check the latest upstream from a directory that does get updated | ||
31 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" | ||
32 | |||
33 | inherit cmake perlnative bash-completion upstream-version-is-even useradd | ||
34 | |||
35 | # User is added to allow apt to drop privs, will runtime warn without | ||
36 | USERADD_PACKAGES = "${PN}" | ||
37 | USERADD_PARAM_${PN} = "--system --home /nonexistent --no-create-home _apt" | ||
38 | |||
39 | BBCLASSEXTEND = "native nativesdk" | ||
40 | |||
41 | DEPENDS += "virtual/libiconv virtual/libintl db gnutls lz4 zlib bzip2 xz" | ||
42 | |||
43 | EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ | ||
44 | -DUSE_NLS=False -DDPKG_DATADIR=${datadir}/dpkg \ | ||
45 | -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ | ||
46 | -DCMAKE_DISABLE_FIND_PACKAGE_Zstd=True \ | ||
47 | " | ||
48 | |||
49 | do_configure_prepend () { | ||
50 | echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH )" >> ${WORKDIR}/toolchain.cmake | ||
51 | |||
52 | } | ||
53 | |||
54 | # Unfortunately apt hardcodes this all over the place | ||
55 | FILES_${PN} += "${prefix}/lib/dpkg ${prefix}/lib/apt" | ||
56 | RDEPENDS_${PN} += "bash perl dpkg" | ||
57 | |||
58 | customize_apt_conf_sample() { | ||
59 | cat > ${D}${sysconfdir}/apt/apt.conf.sample << EOF | ||
60 | Dir "${STAGING_DIR_NATIVE}/" | ||
61 | { | ||
62 | State "var/lib/apt/" | ||
63 | { | ||
64 | Lists "#APTCONF#/lists/"; | ||
65 | status "#ROOTFS#/var/lib/dpkg/status"; | ||
66 | }; | ||
67 | Cache "var/cache/apt/" | ||
68 | { | ||
69 | Archives "archives/"; | ||
70 | pkgcache ""; | ||
71 | srcpkgcache ""; | ||
72 | }; | ||
73 | Bin "${STAGING_BINDIR_NATIVE}/" | ||
74 | { | ||
75 | methods "${STAGING_LIBDIR}/apt/methods/"; | ||
76 | gzip "/bin/gzip"; | ||
77 | dpkg "dpkg"; | ||
78 | dpkg-source "dpkg-source"; | ||
79 | dpkg-buildpackage "dpkg-buildpackage"; | ||
80 | apt-get "apt-get"; | ||
81 | apt-cache "apt-cache"; | ||
82 | }; | ||
83 | Etc "#APTCONF#" | ||
84 | { | ||
85 | Preferences "preferences"; | ||
86 | }; | ||
87 | Log "var/log/apt"; | ||
88 | }; | ||
89 | |||
90 | APT | ||
91 | { | ||
92 | Install-Recommends "true"; | ||
93 | Immediate-Configure "false"; | ||
94 | Architecture "i586"; | ||
95 | Get | ||
96 | { | ||
97 | Assume-Yes "true"; | ||
98 | }; | ||
99 | }; | ||
100 | |||
101 | Acquire | ||
102 | { | ||
103 | AllowInsecureRepositories "true"; | ||
104 | }; | ||
105 | |||
106 | DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-debsig"}; | ||
107 | DPkg::Path ""; | ||
108 | EOF | ||
109 | } | ||
110 | |||
111 | do_install_append_class-native() { | ||
112 | customize_apt_conf_sample | ||
113 | } | ||
114 | |||
115 | do_install_append_class-nativesdk() { | ||
116 | customize_apt_conf_sample | ||
117 | } | ||
118 | |||
119 | |||
120 | do_install_append_class-target() { | ||
121 | #Write the correct apt-architecture to apt.conf | ||
122 | APT_CONF=${D}/etc/apt/apt.conf | ||
123 | echo 'APT::Architecture "${DPKG_ARCH}";' > ${APT_CONF} | ||
124 | } | ||
125 | |||
126 | # Avoid non-reproducible -src package | ||
127 | do_install_append () { | ||
128 | sed -i -e "s,${B},,g" \ | ||
129 | ${B}/apt-pkg/tagfile-keys.cc | ||
130 | } | ||