mirror of
https://git.yoctoproject.org/poky
synced 2026-03-16 20:29:41 +01:00
populate_sdk_rpm.bbclass: remove old shell code
The old code no more needed since the job is done in python now. (From OE-Core rev: 96bf2a93bb75fea23732014106039e14d72cd1c7) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia
committed by
Richard Purdie
Richard Purdie
parent
ed89fd28d7
commit
9d3c187b1a
@@ -14,161 +14,9 @@ do_populate_sdk[depends] += "createrepo-native:do_populate_sysroot"
|
||||
do_populate_sdk[recrdeptask] += "do_package_write_rpm"
|
||||
|
||||
rpmlibdir = "/var/lib/rpm"
|
||||
RPMOPTS="--dbpath ${rpmlibdir}"
|
||||
RPM="rpm ${RPMOPTS}"
|
||||
|
||||
do_populate_sdk[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"
|
||||
|
||||
populate_sdk_post_rpm () {
|
||||
|
||||
local target_rootfs=$1
|
||||
|
||||
# remove lock files
|
||||
rm -f ${target_rootfs}/__db.*
|
||||
|
||||
# Remove all remaining resolver files
|
||||
rm -rf ${target_rootfs}/install
|
||||
rm -rf ${target_rootfs}/var/lib/smart
|
||||
}
|
||||
|
||||
populate_sdk_rpm () {
|
||||
|
||||
package_update_index_rpm
|
||||
|
||||
## install target ##
|
||||
# This needs to work in the same way as rootfs_rpm.bbclass!
|
||||
#
|
||||
export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
|
||||
export INSTALL_PLATFORM_RPM="$(echo ${TARGET_ARCH} | tr - _)${TARGET_VENDOR}-${TARGET_OS}"
|
||||
export INSTALL_PACKAGES_RPM="${TOOLCHAIN_TARGET_TASK}"
|
||||
export INSTALL_PACKAGES_ATTEMPTONLY_RPM="$(echo '${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}' | sed 's/ *$//g')"
|
||||
export INSTALL_PACKAGES_LINGUAS_RPM=""
|
||||
# We don't need any of these runtime items for the SDK, so
|
||||
# just make the system assume they exist.
|
||||
export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig"
|
||||
export INSTALL_TASK_RPM="populate_sdk-target"
|
||||
export INSTALL_COMPLEMENTARY_RPM=""
|
||||
export INTERCEPT_DIR=${WORKDIR}/intercept_scripts
|
||||
export NATIVE_ROOT=${STAGING_DIR_NATIVE}
|
||||
|
||||
# Setup base system configuration
|
||||
mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/
|
||||
|
||||
# List must be prefered to least preferred order
|
||||
default_extra_rpm=""
|
||||
INSTALL_PLATFORM_EXTRA_RPM=""
|
||||
for os in ${MULTILIB_OS_LIST} ; do
|
||||
old_IFS="$IFS"
|
||||
IFS=":"
|
||||
set -- $os
|
||||
IFS="$old_IFS"
|
||||
mlib=$1
|
||||
mlib_os=$2
|
||||
for prefix in ${MULTILIB_PREFIX_LIST} ; do
|
||||
old_IFS="$IFS"
|
||||
IFS=":"
|
||||
set -- $prefix
|
||||
IFS="$old_IFS"
|
||||
if [ "$mlib" != "$1" ]; then
|
||||
continue
|
||||
fi
|
||||
shift #remove mlib
|
||||
while [ -n "$1" ]; do
|
||||
platform="$(echo $1 | tr - _)-.*-$mlib_os"
|
||||
if [ "$mlib" = "${BBEXTENDVARIANT}" ]; then
|
||||
default_extra_rpm="$default_extra_rpm $platform"
|
||||
else
|
||||
INSTALL_PLATFORM_EXTRA_RPM="$INSTALL_PLATFORM_EXTRA_RPM $platform"
|
||||
fi
|
||||
shift
|
||||
done
|
||||
done
|
||||
done
|
||||
if [ -n "$default_extra_rpm" ]; then
|
||||
INSTALL_PLATFORM_EXTRA_RPM="$default_extra_rpm $INSTALL_PLATFORM_EXTRA_RPM"
|
||||
fi
|
||||
export INSTALL_PLATFORM_EXTRA_RPM
|
||||
|
||||
package_install_internal_rpm
|
||||
${POPULATE_SDK_POST_TARGET_COMMAND}
|
||||
populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM}
|
||||
|
||||
## install nativesdk ##
|
||||
echo "Installing NATIVESDK packages"
|
||||
export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}"
|
||||
export INSTALL_PLATFORM_RPM="$(echo ${TARGET_ARCH} | tr - _)${SDK_VENDOR}-${SDK_OS}"
|
||||
export INSTALL_PACKAGES_RPM="${TOOLCHAIN_HOST_TASK}"
|
||||
export INSTALL_PACKAGES_ATTEMPTONLY_RPM="$(echo '${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}' | sed 's/ *$//g')"
|
||||
export INSTALL_PACKAGES_LINGUAS_RPM=""
|
||||
export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig libGL.so()(64bit) libGL.so"
|
||||
export INSTALL_TASK_RPM="populate_sdk_rpm-nativesdk"
|
||||
export INSTALL_COMPLEMENTARY_RPM=""
|
||||
|
||||
# List must be prefered to least preferred order
|
||||
INSTALL_PLATFORM_EXTRA_RPM=""
|
||||
for each_arch in ${SDK_PACKAGE_ARCHS} ; do
|
||||
platform="$(echo $each_arch | tr - _)-.*-${SDK_OS}"
|
||||
INSTALL_PLATFORM_EXTRA_RPM="$platform $INSTALL_PLATFORM_EXTRA_RPM"
|
||||
done
|
||||
export INSTALL_PLATFORM_EXTRA_RPM
|
||||
|
||||
package_install_internal_rpm --sdk
|
||||
${POPULATE_SDK_POST_HOST_COMMAND}
|
||||
populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM}
|
||||
|
||||
# move host RPM library data
|
||||
install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/rpm
|
||||
mv ${SDK_OUTPUT}${rpmlibdir}/* ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/rpm/
|
||||
rm -Rf ${SDK_OUTPUT}/var
|
||||
|
||||
install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}
|
||||
mv ${SDK_OUTPUT}/etc/* ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}/
|
||||
rm -rf ${SDK_OUTPUT}/etc
|
||||
|
||||
populate_sdk_log_check populate_sdk
|
||||
}
|
||||
|
||||
python () {
|
||||
# The following code should be kept in sync w/ the rootfs_rpm version.
|
||||
|
||||
# package_arch order is reversed. This ensures the -best- match is listed first!
|
||||
package_archs = d.getVar("PACKAGE_ARCHS", True) or ""
|
||||
package_archs = ":".join(package_archs.split()[::-1])
|
||||
package_os = d.getVar("TARGET_OS", True) or ""
|
||||
ml_prefix_list = "%s:%s" % ('default', package_archs)
|
||||
ml_os_list = "%s:%s" % ('default', package_os)
|
||||
multilibs = d.getVar('MULTILIBS', True) or ""
|
||||
for ext in multilibs.split():
|
||||
eext = ext.split(':')
|
||||
if len(eext) > 1 and eext[0] == 'multilib':
|
||||
localdata = bb.data.createCopy(d)
|
||||
default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False)
|
||||
if default_tune:
|
||||
localdata.setVar("DEFAULTTUNE", default_tune)
|
||||
bb.data.update_data(localdata)
|
||||
package_archs = localdata.getVar("PACKAGE_ARCHS", True) or ""
|
||||
package_archs = ":".join([i in "all noarch any".split() and i or eext[1]+"_"+i for i in package_archs.split()][::-1])
|
||||
package_os = localdata.getVar("TARGET_OS", True) or ""
|
||||
ml_prefix_list += " %s:%s" % (eext[1], package_archs)
|
||||
ml_os_list += " %s:%s" % (eext[1], package_os)
|
||||
d.setVar('MULTILIB_PREFIX_LIST', ml_prefix_list)
|
||||
d.setVar('MULTILIB_OS_LIST', ml_os_list)
|
||||
}
|
||||
|
||||
RPM_QUERY_CMD = '${RPM} --root $INSTALL_ROOTFS_RPM -D "_dbpath ${rpmlibdir}"'
|
||||
|
||||
list_installed_packages() {
|
||||
if [ "$1" = "arch" ]; then
|
||||
${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" | translate_smart_to_oe arch
|
||||
elif [ "$1" = "file" ]; then
|
||||
${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH} %{PACKAGEORIGIN}\n]" | translate_smart_to_oe file
|
||||
elif [ "$1" = "ver" ]; then
|
||||
${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH} %{VERSION}\n]" | translate_smart_to_oe arch
|
||||
else
|
||||
${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]" | translate_smart_to_oe
|
||||
fi
|
||||
}
|
||||
|
||||
rootfs_list_installed_depends() {
|
||||
rpmresolve -t $INSTALL_ROOTFS_RPM/${rpmlibdir}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user