classes: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] (From OE-Core rev: 9fbeab63315fef0dbcc91c5e7051665764758a6e) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
ffec48ad4e
commit
51c7ad682f
|
@ -7,7 +7,7 @@ EXCLUDE_FROM_WORLD = "1"
|
||||||
CLASSOVERRIDE = "class-cross"
|
CLASSOVERRIDE = "class-cross"
|
||||||
PACKAGES = ""
|
PACKAGES = ""
|
||||||
PACKAGES_DYNAMIC = ""
|
PACKAGES_DYNAMIC = ""
|
||||||
PACKAGES_DYNAMIC_virtclass-native = ""
|
PACKAGES_DYNAMIC_class-native = ""
|
||||||
|
|
||||||
HOST_ARCH = "${BUILD_ARCH}"
|
HOST_ARCH = "${BUILD_ARCH}"
|
||||||
HOST_VENDOR = "${BUILD_VENDOR}"
|
HOST_VENDOR = "${BUILD_VENDOR}"
|
||||||
|
|
|
@ -24,8 +24,8 @@ PACKAGEFUNCS += " do_package_qa "
|
||||||
# unsafe-references-in-binaries requires prelink-rtld from
|
# unsafe-references-in-binaries requires prelink-rtld from
|
||||||
# prelink-native, but we don't want this DEPENDS for -native builds
|
# prelink-native, but we don't want this DEPENDS for -native builds
|
||||||
QADEPENDS = "prelink-native"
|
QADEPENDS = "prelink-native"
|
||||||
QADEPENDS_virtclass-native = ""
|
QADEPENDS_class-native = ""
|
||||||
QADEPENDS_virtclass-nativesdk = ""
|
QADEPENDS_class-nativesdk = ""
|
||||||
|
|
||||||
#
|
#
|
||||||
# dictionary for elf headers
|
# dictionary for elf headers
|
||||||
|
|
|
@ -6,14 +6,14 @@ inherit relocatable
|
||||||
EXCLUDE_FROM_WORLD = "1"
|
EXCLUDE_FROM_WORLD = "1"
|
||||||
|
|
||||||
PACKAGES = ""
|
PACKAGES = ""
|
||||||
PACKAGES_virtclass-native = ""
|
PACKAGES_class-native = ""
|
||||||
PACKAGES_DYNAMIC = ""
|
PACKAGES_DYNAMIC = ""
|
||||||
PACKAGES_DYNAMIC_virtclass-native = ""
|
PACKAGES_DYNAMIC_class-native = ""
|
||||||
PACKAGE_ARCH = "${BUILD_ARCH}"
|
PACKAGE_ARCH = "${BUILD_ARCH}"
|
||||||
|
|
||||||
# used by cmake class
|
# used by cmake class
|
||||||
OECMAKE_RPATH = "${libdir}"
|
OECMAKE_RPATH = "${libdir}"
|
||||||
OECMAKE_RPATH_virtclass-native = "${libdir}"
|
OECMAKE_RPATH_class-native = "${libdir}"
|
||||||
|
|
||||||
# When this class has packaging enabled, setting
|
# When this class has packaging enabled, setting
|
||||||
# RPROVIDES becomes unnecessary.
|
# RPROVIDES becomes unnecessary.
|
||||||
|
|
|
@ -3,8 +3,8 @@ UPDATERCPN ?= "${PN}"
|
||||||
DEPENDS_append = " update-rc.d-native"
|
DEPENDS_append = " update-rc.d-native"
|
||||||
UPDATERCD = "update-rc.d"
|
UPDATERCD = "update-rc.d"
|
||||||
UPDATERCD_virtclass-cross = ""
|
UPDATERCD_virtclass-cross = ""
|
||||||
UPDATERCD_virtclass-native = ""
|
UPDATERCD_class-native = ""
|
||||||
UPDATERCD_virtclass-nativesdk = ""
|
UPDATERCD_class-nativesdk = ""
|
||||||
|
|
||||||
RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}"
|
RDEPENDS_${UPDATERCPN}_append = " ${UPDATERCD}"
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
DEPENDS_append = "${USERADDDEPENDS}"
|
DEPENDS_append = "${USERADDDEPENDS}"
|
||||||
USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow"
|
USERADDDEPENDS = " base-passwd shadow-native shadow-sysroot shadow"
|
||||||
USERADDDEPENDS_virtclass-cross = ""
|
USERADDDEPENDS_virtclass-cross = ""
|
||||||
USERADDDEPENDS_virtclass-native = ""
|
USERADDDEPENDS_class-native = ""
|
||||||
USERADDDEPENDS_virtclass-nativesdk = ""
|
USERADDDEPENDS_class-nativesdk = ""
|
||||||
|
|
||||||
# This preinstall function can be run in four different contexts:
|
# This preinstall function can be run in four different contexts:
|
||||||
#
|
#
|
||||||
|
@ -138,18 +138,18 @@ useradd_sysroot_sstate () {
|
||||||
do_install[prefuncs] += "${SYSROOTFUNC}"
|
do_install[prefuncs] += "${SYSROOTFUNC}"
|
||||||
SYSROOTFUNC = "useradd_sysroot"
|
SYSROOTFUNC = "useradd_sysroot"
|
||||||
SYSROOTFUNC_virtclass-cross = ""
|
SYSROOTFUNC_virtclass-cross = ""
|
||||||
SYSROOTFUNC_virtclass-native = ""
|
SYSROOTFUNC_class-native = ""
|
||||||
SYSROOTFUNC_virtclass-nativesdk = ""
|
SYSROOTFUNC_class-nativesdk = ""
|
||||||
SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}"
|
SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}"
|
||||||
SYSROOTPOSTFUNC = "useradd_sysroot_sstate"
|
SYSROOTPOSTFUNC = "useradd_sysroot_sstate"
|
||||||
SYSROOTPOSTFUNC_virtclass-cross = ""
|
SYSROOTPOSTFUNC_virtclass-cross = ""
|
||||||
SYSROOTPOSTFUNC_virtclass-native = ""
|
SYSROOTPOSTFUNC_class-native = ""
|
||||||
SYSROOTPOSTFUNC_virtclass-nativesdk = ""
|
SYSROOTPOSTFUNC_class-nativesdk = ""
|
||||||
|
|
||||||
USERADDSETSCENEDEPS = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene shadow-native:do_populate_sysroot_setscene ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene"
|
USERADDSETSCENEDEPS = "${MLPREFIX}base-passwd:do_populate_sysroot_setscene shadow-native:do_populate_sysroot_setscene ${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene"
|
||||||
USERADDSETSCENEDEPS_virtclass-cross = ""
|
USERADDSETSCENEDEPS_virtclass-cross = ""
|
||||||
USERADDSETSCENEDEPS_virtclass-native = ""
|
USERADDSETSCENEDEPS_class-native = ""
|
||||||
USERADDSETSCENEDEPS_virtclass-nativesdk = ""
|
USERADDSETSCENEDEPS_class-nativesdk = ""
|
||||||
do_package_setscene[depends] = "${USERADDSETSCENEDEPS}"
|
do_package_setscene[depends] = "${USERADDSETSCENEDEPS}"
|
||||||
|
|
||||||
# Recipe parse-time sanity checks
|
# Recipe parse-time sanity checks
|
||||||
|
|
Loading…
Reference in New Issue