summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/apt
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt')
-rw-r--r--meta/recipes-devtools/apt/apt_2.2.4.bb22
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-devtools/apt/apt_2.2.4.bb b/meta/recipes-devtools/apt/apt_2.2.4.bb
index f120111410..29fc49fb39 100644
--- a/meta/recipes-devtools/apt/apt_2.2.4.bb
+++ b/meta/recipes-devtools/apt/apt_2.2.4.bb
@@ -16,12 +16,12 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \
16 file://0001-aptwebserver.cc-Include-array.patch \ 16 file://0001-aptwebserver.cc-Include-array.patch \
17 " 17 "
18 18
19SRC_URI_append_class-native = " \ 19SRC_URI:append:class-native = " \
20 file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ 20 file://0001-Do-not-init-tables-from-dpkg-configuration.patch \
21 file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ 21 file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \
22 " 22 "
23 23
24SRC_URI_append_class-nativesdk = " \ 24SRC_URI:append:class-nativesdk = " \
25 file://0001-Do-not-init-tables-from-dpkg-configuration.patch \ 25 file://0001-Do-not-init-tables-from-dpkg-configuration.patch \
26 file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ 26 file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \
27 " 27 "
@@ -37,13 +37,13 @@ inherit cmake perlnative bash-completion upstream-version-is-even useradd
37 37
38# User is added to allow apt to drop privs, will runtime warn without 38# User is added to allow apt to drop privs, will runtime warn without
39USERADD_PACKAGES = "${PN}" 39USERADD_PACKAGES = "${PN}"
40USERADD_PARAM_${PN} = "--system --home /nonexistent --no-create-home _apt" 40USERADD_PARAM:${PN} = "--system --home /nonexistent --no-create-home _apt"
41 41
42BBCLASSEXTEND = "native nativesdk" 42BBCLASSEXTEND = "native nativesdk"
43 43
44DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" 44DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash"
45 45
46EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ 46EXTRA_OECMAKE:append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \
47 -DDPKG_DATADIR=${datadir}/dpkg \ 47 -DDPKG_DATADIR=${datadir}/dpkg \
48 -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ 48 -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \
49 -DCMAKE_DISABLE_FIND_PACKAGE_ZSTD=True \ 49 -DCMAKE_DISABLE_FIND_PACKAGE_ZSTD=True \
@@ -51,14 +51,14 @@ EXTRA_OECMAKE_append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \
51 -DWITH_TESTS=False \ 51 -DWITH_TESTS=False \
52" 52"
53 53
54do_configure_prepend () { 54do_configure:prepend () {
55 echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH )" >> ${WORKDIR}/toolchain.cmake 55 echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH )" >> ${WORKDIR}/toolchain.cmake
56 56
57} 57}
58 58
59# Unfortunately apt hardcodes this all over the place 59# Unfortunately apt hardcodes this all over the place
60FILES_${PN} += "${prefix}/lib/dpkg ${prefix}/lib/apt" 60FILES:${PN} += "${prefix}/lib/dpkg ${prefix}/lib/apt"
61RDEPENDS_${PN} += "bash perl dpkg" 61RDEPENDS:${PN} += "bash perl dpkg"
62 62
63customize_apt_conf_sample() { 63customize_apt_conf_sample() {
64 cat > ${D}${sysconfdir}/apt/apt.conf.sample << EOF 64 cat > ${D}${sysconfdir}/apt/apt.conf.sample << EOF
@@ -113,23 +113,23 @@ DPkg::Path "";
113EOF 113EOF
114} 114}
115 115
116do_install_append_class-native() { 116do_install:append:class-native() {
117 customize_apt_conf_sample 117 customize_apt_conf_sample
118} 118}
119 119
120do_install_append_class-nativesdk() { 120do_install:append:class-nativesdk() {
121 customize_apt_conf_sample 121 customize_apt_conf_sample
122} 122}
123 123
124 124
125do_install_append_class-target() { 125do_install:append:class-target() {
126 #Write the correct apt-architecture to apt.conf 126 #Write the correct apt-architecture to apt.conf
127 APT_CONF=${D}/etc/apt/apt.conf 127 APT_CONF=${D}/etc/apt/apt.conf
128 echo 'APT::Architecture "${DPKG_ARCH}";' > ${APT_CONF} 128 echo 'APT::Architecture "${DPKG_ARCH}";' > ${APT_CONF}
129} 129}
130 130
131# Avoid non-reproducible -src package 131# Avoid non-reproducible -src package
132do_install_append () { 132do_install:append () {
133 sed -i -e "s,${B},,g" \ 133 sed -i -e "s,${B},,g" \
134 ${B}/apt-pkg/tagfile-keys.cc 134 ${B}/apt-pkg/tagfile-keys.cc
135} 135}