diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-01-22 14:33:57 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 11:53:41 +0000 |
commit | cb137719f254359fbd5a9f92a76c597e4e5216e7 (patch) | |
tree | 260a5dfd6adc5f7de28d2b52e78bbd63d027e213 | |
parent | e5a164231dfa4fa8067459daaa1d80486f5e0abb (diff) | |
download | poky-cb137719f254359fbd5a9f92a76c597e4e5216e7.tar.gz |
populate_sdk_(deb|ipk).bbclass: remove old shell code
The old code no more needed since the job is done in python now.
(From OE-Core rev: 58f06621aa1a5618dc969e8d1b537e32763a9461)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/populate_sdk_deb.bbclass | 59 | ||||
-rw-r--r-- | meta/classes/populate_sdk_ipk.bbclass | 54 |
2 files changed, 0 insertions, 113 deletions
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass index a63280d1ef..d03b0551e9 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"]\ | |||
8 | 8 | ||
9 | do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" | 9 | do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" |
10 | 10 | ||
11 | populate_sdk_post_deb () { | ||
12 | |||
13 | local target_rootfs=$1 | ||
14 | |||
15 | mkdir -p ${target_rootfs}/etc | ||
16 | tar -cf - -C ${STAGING_ETCDIR_NATIVE} -p apt | tar -xf - -C ${target_rootfs}/etc | ||
17 | } | ||
18 | |||
19 | populate_sdk_deb () { | ||
20 | |||
21 | # update index | ||
22 | package_update_index_deb | ||
23 | |||
24 | ## install target ## | ||
25 | # This needs to work in the same way as rootfs_deb.bbclass | ||
26 | echo "Installing TARGET packages" | ||
27 | |||
28 | mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives | ||
29 | |||
30 | export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" | ||
31 | export INSTALL_BASEARCH_DEB="${DPKG_ARCH}" | ||
32 | export INSTALL_ARCHS_DEB="${PACKAGE_ARCHS}" | ||
33 | export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_TARGET_TASK}" | ||
34 | export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}" | ||
35 | export PACKAGES_LINGUAS_DEB="" | ||
36 | export INSTALL_TASK_DEB="populate_sdk-target" | ||
37 | export INTERCEPT_DIR=${WORKDIR}/intercept_scripts | ||
38 | export NATIVE_ROOT=${STAGING_DIR_NATIVE} | ||
39 | |||
40 | package_install_internal_deb | ||
41 | |||
42 | ${POPULATE_SDK_POST_TARGET_COMMAND} | ||
43 | |||
44 | populate_sdk_post_deb ${INSTALL_ROOTFS_DEB} | ||
45 | |||
46 | populate_sdk_log_check populate_sdk | ||
47 | |||
48 | ## install nativesdk ## | ||
49 | echo "Installing NATIVESDK packages" | ||
50 | export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}" | ||
51 | export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}" | ||
52 | export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}" | ||
53 | export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}" | ||
54 | export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}" | ||
55 | export PACKAGES_LINGUAS_DEB="" | ||
56 | export INSTALL_TASK_DEB="populate_sdk-nativesdk" | ||
57 | |||
58 | package_install_internal_deb | ||
59 | ${POPULATE_SDK_POST_HOST_COMMAND} | ||
60 | populate_sdk_post_deb ${SDK_OUTPUT}/${SDKPATHNATIVE} | ||
61 | |||
62 | #move remainings | ||
63 | install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/lib/dpkg | ||
64 | mv ${SDK_OUTPUT}/var/lib/dpkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/lib/dpkg | ||
65 | rm -rf ${SDK_OUTPUT}/var | ||
66 | |||
67 | populate_sdk_log_check populate_sdk | ||
68 | } | ||
69 | |||
70 | # This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb has been called | 11 | # This will of course only work after rootfs_deb_do_rootfs or populate_sdk_deb has been called |
71 | DPKG_QUERY_COMMAND = "${STAGING_BINDIR_NATIVE}/dpkg-query --admindir=$INSTALL_ROOTFS_DEB/var/lib/dpkg" | 12 | DPKG_QUERY_COMMAND = "${STAGING_BINDIR_NATIVE}/dpkg-query --admindir=$INSTALL_ROOTFS_DEB/var/lib/dpkg" |
72 | 13 | ||
diff --git a/meta/classes/populate_sdk_ipk.bbclass b/meta/classes/populate_sdk_ipk.bbclass index fc6ed536a8..f51a22cb8a 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" | |||
3 | 3 | ||
4 | do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" | 4 | do_populate_sdk[lockfiles] += "${WORKDIR}/ipk.lock" |
5 | 5 | ||
6 | populate_sdk_ipk() { | ||
7 | |||
8 | rm -f ${IPKGCONF_TARGET} | ||
9 | touch ${IPKGCONF_TARGET} | ||
10 | rm -f ${IPKGCONF_SDK} | ||
11 | touch ${IPKGCONF_SDK} | ||
12 | |||
13 | package_update_index_ipk | ||
14 | package_generate_ipkg_conf | ||
15 | |||
16 | export INSTALL_PACKAGES_LINGUAS_IPK="" | ||
17 | export INSTALL_TASK_IPK="populate_sdk" | ||
18 | |||
19 | #install target | ||
20 | export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" | ||
21 | export INSTALL_CONF_IPK="${IPKGCONF_TARGET}" | ||
22 | export INSTALL_PACKAGES_IPK="${TOOLCHAIN_TARGET_TASK}" | ||
23 | export INSTALL_PACKAGES_ATTEMPTONLY_IPK="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}" | ||
24 | |||
25 | export D=${INSTALL_ROOTFS_IPK} | ||
26 | export OFFLINE_ROOT=${INSTALL_ROOTFS_IPK} | ||
27 | export IPKG_OFFLINE_ROOT=${INSTALL_ROOTFS_IPK} | ||
28 | export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT} | ||
29 | export INTERCEPT_DIR=${WORKDIR}/intercept_scripts | ||
30 | export NATIVE_ROOT=${STAGING_DIR_NATIVE} | ||
31 | |||
32 | package_install_internal_ipk | ||
33 | |||
34 | ${POPULATE_SDK_POST_TARGET_COMMAND} | ||
35 | |||
36 | #install host | ||
37 | export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}" | ||
38 | export INSTALL_CONF_IPK="${IPKGCONF_SDK}" | ||
39 | export INSTALL_PACKAGES_IPK="${TOOLCHAIN_HOST_TASK}" | ||
40 | export INSTALL_PACKAGES_ATTEMPTONLY_IPK="${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}" | ||
41 | |||
42 | package_install_internal_ipk | ||
43 | |||
44 | ${POPULATE_SDK_POST_HOST_COMMAND} | ||
45 | |||
46 | #post clean up | ||
47 | install -d ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/${sysconfdir} | ||
48 | install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/${sysconfdir}/ | ||
49 | |||
50 | install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir} | ||
51 | install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${SDKPATHNATIVE}/${sysconfdir}/ | ||
52 | |||
53 | install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/opkg | ||
54 | mv ${SDK_OUTPUT}/var/lib/opkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}${localstatedir_nativesdk}/lib/opkg/ | ||
55 | rm -Rf ${SDK_OUTPUT}/var | ||
56 | |||
57 | populate_sdk_log_check populate_sdk | ||
58 | } | ||
59 | |||
60 | list_installed_packages() { | 6 | list_installed_packages() { |
61 | if [ "$1" = "arch" ] ; then | 7 | if [ "$1" = "arch" ] ; then |
62 | opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -a | 8 | opkg-cl ${OPKG_ARGS} status | opkg-query-helper.py -a |