diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/git/git.inc | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-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/git/git.inc')
-rw-r--r-- | meta/recipes-devtools/git/git.inc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 146983a918..9dd2cf4549 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc | |||
@@ -5,7 +5,7 @@ SECTION = "console/utils" | |||
5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPLv2" |
6 | DEPENDS = "openssl curl zlib expat" | 6 | DEPENDS = "openssl curl zlib expat" |
7 | 7 | ||
8 | PROVIDES_append_class-native = " git-replacement-native" | 8 | PROVIDES:append:class-native = " git-replacement-native" |
9 | 9 | ||
10 | SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ | 10 | SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ |
11 | ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \ | 11 | ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \ |
@@ -26,16 +26,16 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ | |||
26 | --without-tcltk \ | 26 | --without-tcltk \ |
27 | --without-iconv \ | 27 | --without-iconv \ |
28 | " | 28 | " |
29 | EXTRA_OECONF_append_class-nativesdk = " --with-gitconfig=/etc/gitconfig " | 29 | EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig " |
30 | 30 | ||
31 | # Needs brokensep as this doesn't use automake | 31 | # Needs brokensep as this doesn't use automake |
32 | inherit autotools-brokensep perlnative bash-completion | 32 | inherit autotools-brokensep perlnative bash-completion |
33 | 33 | ||
34 | EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" | 34 | EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" |
35 | EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'" | 35 | EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'" |
36 | EXTRA_OEMAKE_append_class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1" | 36 | EXTRA_OEMAKE:append:class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1" |
37 | 37 | ||
38 | do_compile_prepend () { | 38 | do_compile:prepend () { |
39 | # Remove perl/perl.mak to fix the out-of-date perl.mak error | 39 | # Remove perl/perl.mak to fix the out-of-date perl.mak error |
40 | # during rebuild | 40 | # during rebuild |
41 | rm -f perl/perl.mak | 41 | rm -f perl/perl.mak |
@@ -79,24 +79,24 @@ perl_native_fixup () { | |||
79 | REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core" | 79 | REL_GIT_EXEC_PATH = "${@os.path.relpath(libexecdir, bindir)}/git-core" |
80 | REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates" | 80 | REL_GIT_TEMPLATE_DIR = "${@os.path.relpath(datadir, bindir)}/git-core/templates" |
81 | 81 | ||
82 | do_install_append_class-target () { | 82 | do_install:append:class-target () { |
83 | perl_native_fixup | 83 | perl_native_fixup |
84 | } | 84 | } |
85 | 85 | ||
86 | do_install_append_class-native() { | 86 | do_install:append:class-native() { |
87 | create_wrapper ${D}${bindir}/git \ | 87 | create_wrapper ${D}${bindir}/git \ |
88 | GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ | 88 | GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ |
89 | GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} | 89 | GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} |
90 | } | 90 | } |
91 | 91 | ||
92 | do_install_append_class-nativesdk() { | 92 | do_install:append:class-nativesdk() { |
93 | create_wrapper ${D}${bindir}/git \ | 93 | create_wrapper ${D}${bindir}/git \ |
94 | GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ | 94 | GIT_EXEC_PATH='`dirname $''realpath`'/${REL_GIT_EXEC_PATH} \ |
95 | GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} | 95 | GIT_TEMPLATE_DIR='`dirname $''realpath`'/${REL_GIT_TEMPLATE_DIR} |
96 | perl_native_fixup | 96 | perl_native_fixup |
97 | } | 97 | } |
98 | 98 | ||
99 | FILES_${PN} += "${datadir}/git-core ${libexecdir}/git-core/" | 99 | FILES:${PN} += "${datadir}/git-core ${libexecdir}/git-core/" |
100 | 100 | ||
101 | PERLTOOLS = " \ | 101 | PERLTOOLS = " \ |
102 | ${bindir}/git-cvsserver \ | 102 | ${bindir}/git-cvsserver \ |
@@ -116,25 +116,25 @@ PERLTOOLS = " \ | |||
116 | 116 | ||
117 | # Git tools requiring perl | 117 | # Git tools requiring perl |
118 | PACKAGES =+ "${PN}-perltools" | 118 | PACKAGES =+ "${PN}-perltools" |
119 | FILES_${PN}-perltools += " \ | 119 | FILES:${PN}-perltools += " \ |
120 | ${PERLTOOLS} \ | 120 | ${PERLTOOLS} \ |
121 | ${libdir}/perl \ | 121 | ${libdir}/perl \ |
122 | ${datadir}/perl5 \ | 122 | ${datadir}/perl5 \ |
123 | " | 123 | " |
124 | 124 | ||
125 | RDEPENDS_${PN}-perltools = "${PN} perl perl-module-file-path findutils" | 125 | RDEPENDS:${PN}-perltools = "${PN} perl perl-module-file-path findutils" |
126 | 126 | ||
127 | # git-tk package with gitk and git-gui | 127 | # git-tk package with gitk and git-gui |
128 | PACKAGES =+ "${PN}-tk" | 128 | PACKAGES =+ "${PN}-tk" |
129 | #RDEPENDS_${PN}-tk = "${PN} tk tcl" | 129 | #RDEPENDS_${PN}-tk = "${PN} tk tcl" |
130 | #EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh" | 130 | #EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh" |
131 | FILES_${PN}-tk = " \ | 131 | FILES:${PN}-tk = " \ |
132 | ${bindir}/gitk \ | 132 | ${bindir}/gitk \ |
133 | ${datadir}/gitk \ | 133 | ${datadir}/gitk \ |
134 | " | 134 | " |
135 | 135 | ||
136 | PACKAGES =+ "gitweb" | 136 | PACKAGES =+ "gitweb" |
137 | FILES_gitweb = "${datadir}/gitweb/" | 137 | FILES:gitweb = "${datadir}/gitweb/" |
138 | RDEPENDS_gitweb = "perl" | 138 | RDEPENDS:gitweb = "perl" |
139 | 139 | ||
140 | BBCLASSEXTEND = "native nativesdk" | 140 | BBCLASSEXTEND = "native nativesdk" |