[oe-commits] Laurentiu Palcu : populate_sdk_(deb|ipk).bbclass: remove old shell code

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 58f06621aa1a5618dc969e8d1b537e32763a9461
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=58f06621aa1a5618dc969e8d1b537e32763a9461

Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date:   Wed Jan 22 14:33:57 2014 +0200

populate_sdk_(deb|ipk).bbclass: remove old shell code

The old code no more needed since the job is done in python now.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>

---

 meta/classes/populate_sdk_deb.bbclass | 59 -----------------------------------
 meta/classes/populate_sdk_ipk.bbclass | 54 --------------------------------
 2 files changed, 113 deletions(-)

diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index a63280d..d03b055 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -8,65 +8,6 @@ DEB_SDK_ARCH = "${@[d.getVar('SDK_ARCH', True), "i386"]\
 
 do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
 
-populate_sdk_post_deb () {
-
-	local target_rootfs=$1
-
-	mkdir -p ${target_rootfs}/etc
-	tar -cf - -C ${STAGING_ETCDIR_NATIVE} -p apt | tar -xf - -C ${target_rootfs}/etc
-}
-
-populate_sdk_deb () {
-
-	# update index
-	package_update_index_deb
-
-	## install target ##
-	# This needs to work in the same way as rootfs_deb.bbclass
-	echo "Installing TARGET packages"
-
-	mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives
-
-	export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
-	export INSTALL_BASEARCH_DEB="${DPKG_ARCH}"
-	export INSTALL_ARCHS_DEB="${PACKAGE_ARCHS}"
-	export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_TARGET_TASK}"
-	export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}"
-	export PACKAGES_LINGUAS_DEB=""
-	export INSTALL_TASK_DEB="populate_sdk-target"
-	export INTERCEPT_DIR=${WORKDIR}/intercept_scripts
-	export NATIVE_ROOT=${STAGING_DIR_NATIVE}
-
-	package_install_internal_deb
-
-	${POPULATE_SDK_POST_TARGET_COMMAND}
-
-	populate_sdk_post_deb ${INSTALL_ROOTFS_DEB}
-
-	populate_sdk_log_check populate_sdk
-
-	## install nativesdk ##
-	echo "Installing NATIVESDK packages"
-	export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
-	export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}"
-	export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}"
-	export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
-	export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}"
-	export PACKAGES_LINGUAS_DEB=""
-	export INSTALL_TASK_DEB="populate_sdk-nativesdk"
-
-	package_install_internal_deb
-	${POPULATE_SDK_POST_HOST_COMMAND}
-	populate_sdk_post_deb ${SDK_OUTPUT}/${SDKPATHNATIVE}
-
-	#move remainings
-	install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/lib/dpkg
-	mv ${SDK_OUTPUT}/var/lib/dpkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/lib/dpkg
-	rm -rf ${SDK_OUTPUT}/var
-
-	populate_sdk_log_check populate_sdk
-}
-
 # This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb has been called
 DPKG_QUERY_COMMAND = "${STAGING_BINDIR_NATIVE}/dpkg-query --admindir=$INSTALL_ROOTFS_DEB/var/lib/dpkg"
 
diff --git a/meta/classes/populate_sdk_ipk.bbclass b/meta/classes/populate_sdk_ipk.bbclass
index fc6ed53..f51a22c 100644
--- a/meta/classes/populate_sdk_ipk.bbclass
+++ b/meta/classes/populate_sdk_ipk.bbclass
@@ -3,60 +3,6 @@ do_populate_sdk[recrdeptask] += "do_package_write_ipk"
 
 do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock"
 
-populate_sdk_ipk() {
-
-	rm -f ${IPKGCONF_TARGET}
-	touch ${IPKGCONF_TARGET}
-	rm -f ${IPKGCONF_SDK}
-	touch ${IPKGCONF_SDK}
-
-	package_update_index_ipk
-	package_generate_ipkg_conf
-
-	export INSTALL_PACKAGES_LINGUAS_IPK=""
-	export INSTALL_TASK_IPK="populate_sdk"
-
-	#install target
-	export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
-	export INSTALL_CONF_IPK="${IPKGCONF_TARGET}"
-	export INSTALL_PACKAGES_IPK="${TOOLCHAIN_TARGET_TASK}"
-	export INSTALL_PACKAGES_ATTEMPTONLY_IPK="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}"
-
-	export D=${INSTALL_ROOTFS_IPK}
-	export OFFLINE_ROOT=${INSTALL_ROOTFS_IPK}
-	export IPKG_OFFLINE_ROOT=${INSTALL_ROOTFS_IPK}
-	export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT}
-	export INTERCEPT_DIR=${WORKDIR}/intercept_scripts
-	export NATIVE_ROOT=${STAGING_DIR_NATIVE}
-
-	package_install_internal_ipk
-
-	${POPULATE_SDK_POST_TARGET_COMMAND}
-
-	#install host
-	export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}"
-	export INSTALL_CONF_IPK="${IPKGCONF_SDK}"
-	export INSTALL_PACKAGES_IPK="${TOOLCHAIN_HOST_TASK}"
-	export INSTALL_PACKAGES_ATTEMPTONLY_IPK="${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}"
-
-	package_install_internal_ipk
-
-	${POPULATE_SDK_POST_HOST_COMMAND}
-
-	#post clean up
-	install -d ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/${sysconfdir}
-	install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/${sysconfdir}/
-
-	install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}
-	install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}/
-
-	install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/opkg
-	mv ${SDK_OUTPUT}/var/lib/opkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/opkg/
-	rm -Rf ${SDK_OUTPUT}/var
-
-	populate_sdk_log_check populate_sdk
-}
-
 list_installed_packages() {
 	if [ "$1" = "arch" ] ; then
 		opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -a