2011-01-30 07:54:05 +00:00
|
|
|
do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot"
|
|
|
|
do_populate_sdk[recrdeptask] += "do_package_write_deb"
|
|
|
|
|
|
|
|
|
2012-03-03 10:59:25 +00:00
|
|
|
DEB_SDK_ARCH = "${@[d.getVar('SDK_ARCH', True), "i386"]\
|
|
|
|
[d.getVar('SDK_ARCH', True) in \
|
package_deb.bbclass, populate_sdk_deb.bbclass: fix meta-toolchain-gmae build
[YOCTO #1070]
Currently with deb packaging, we have 2 issues when running
"bitbake meta-toolchain-gmae".
1) when MACHINE="qemux86", SDKMACHINE="i686", INSTALL_BASEARCH_DEB is "i686",
too. This causes the following ERROR:
| E: Couldn't find package task-sdk-host-nativesdk
NOTE: package meta-toolchain-gmae-1.0-r6: task do_populate_sdk: Failed
This is becasue: due to the DPKG_ARCH mapping, we create such a deb package
tmp/deploy/deb/i686-nativesdk/task-sdk-host-nativesdk_1.0-r10_i386.deb; dpkg
can't recoginze the package. We need to map INSTALL_BASEARCH_DEB in the same
way.
2) when MACHINE="qemux86", SDKMACHINE="x86_64", INSTALL_BASEARCH_DEB is
"x86_64", too.
We get such an ERROR:
| E: Couldn't find package task-cross-canadian-i586
NOTE: package meta-toolchain-gmae-1.0-r6: task do_populate_sdk: Failed
This is because: dpkg can't recognize the generated package
tmp/deploy/deb/x86_64-nativesdk/task-cross-canadian-i586_1.0-r0_i386.deb
Here the "i386" suffix is incorrect and should be "x86_64" -- the i386
comes from the line
DPKG_ARCH_i586 ?= "i386" in package_deb.bbclass.
However, for canadian package, actually here the overriding of DPKG (from
"x86-64" to "i386") should not happen -- it accidently happens just because
TARGET_ARCH exists in OVERRIDES. We can move the overriding logic to the
anonymous python function to work this around.
(From OE-Core rev: 63010b9ee89643c8e83656783231f0a7848d9e45)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-14 14:30:14 +00:00
|
|
|
["x86", "i486", "i586", "i686", "pentium"]]}"
|
|
|
|
|
2012-08-13 13:03:45 +00:00
|
|
|
do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
|
2012-06-23 00:38:30 +00:00
|
|
|
|
2011-01-30 07:54:05 +00:00
|
|
|
populate_sdk_post_deb () {
|
|
|
|
|
|
|
|
local target_rootfs=$1
|
|
|
|
|
2012-08-13 13:03:45 +00:00
|
|
|
mkdir -p ${target_rootfs}/etc
|
2011-09-06 09:12:20 +00:00
|
|
|
tar -cf - -C ${STAGING_ETCDIR_NATIVE} -ps apt | tar -xf - -C ${target_rootfs}/etc
|
2011-01-30 07:54:05 +00:00
|
|
|
}
|
|
|
|
|
2011-11-10 18:02:56 +00:00
|
|
|
populate_sdk_deb () {
|
2011-01-30 07:54:05 +00:00
|
|
|
|
2011-08-01 17:34:51 +00:00
|
|
|
# update index
|
2011-01-30 07:54:05 +00:00
|
|
|
package_update_index_deb
|
|
|
|
|
2011-08-01 17:34:51 +00:00
|
|
|
## install target ##
|
|
|
|
# This needs to work in the same way as rootfs_deb.bbclass
|
2011-01-30 07:54:05 +00:00
|
|
|
echo "Installing TARGET packages"
|
2011-08-01 17:34:51 +00:00
|
|
|
|
|
|
|
mkdir -p ${IMAGE_ROOTFS}/var/dpkg/alternatives
|
|
|
|
|
2011-01-30 07:54:05 +00:00
|
|
|
export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
|
|
|
|
export INSTALL_BASEARCH_DEB="${DPKG_ARCH}"
|
|
|
|
export INSTALL_ARCHS_DEB="${PACKAGE_ARCHS}"
|
2011-11-10 18:03:30 +00:00
|
|
|
export INSTALL_PACKAGES_DEB="${TOOLCHAIN_TARGET_TASK}"
|
2012-06-21 20:11:53 +00:00
|
|
|
export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}"
|
2011-08-01 17:34:51 +00:00
|
|
|
export PACKAGES_LINGUAS_DEB=""
|
|
|
|
export INSTALL_TASK_DEB="populate_sdk-target"
|
2011-01-30 07:54:05 +00:00
|
|
|
|
|
|
|
package_install_internal_deb
|
2011-08-01 17:34:51 +00:00
|
|
|
|
Rework installation of dev, dbg, doc, and locale packages
Use a similar mechanism that was previously used to install locales at
rootfs generation time to install other "complementary" packages (e.g.
*-dev packages) - i.e. install all of the explicitly requested packages
and their dependencies, then get a list of the packages that were
installed, and use that list to install the complementary packages. This
has been implemented by using a list of globs which should make it
easier to extend in future.
The previous locale package installation code assumed that the locale
packages did not have any dependencies that were not already installed;
now that we are installing non-locale packages this is no longer
correct. In practice only the rpm backend actually made use of this
assumption, so it needed to be changed to call into the existing package
backend code to do the complementary package installation rather than
calling rpm directly.
This fixes the doc-pkgs IMAGE_FEATURES feature to work correctly, and
also ensures that all dev/dbg packages get installed for
dev-pkgs/dbg-pkgs respectively even if the dependency chains between
those packages was not ensuring that already.
The code has also been adapted to work correctly with the new
SDK-from-image functionality. To that end, an SDKIMAGE_FEATURES variable
has been added to allow specifying what extra image features should go
into the SDK (extra, because by virtue of installing all of the packages
in the image into the target part of the SDK, we already include all of
IMAGE_FEATURES) with a default value of "dev-pkgs dbg-pkgs".
Fixes [YOCTO #2614].
(From OE-Core rev: 72d1048a8381fa4a8c4c0d082047536727b4be47)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-09 13:15:08 +00:00
|
|
|
${POPULATE_SDK_POST_TARGET_COMMAND}
|
|
|
|
|
2011-01-30 07:54:05 +00:00
|
|
|
populate_sdk_post_deb ${INSTALL_ROOTFS_DEB}
|
|
|
|
|
|
|
|
populate_sdk_log_check populate_sdk
|
|
|
|
|
2011-08-01 17:34:51 +00:00
|
|
|
## install nativesdk ##
|
|
|
|
echo "Installing NATIVESDK packages"
|
2011-01-30 07:54:05 +00:00
|
|
|
export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
|
package_deb.bbclass, populate_sdk_deb.bbclass: fix meta-toolchain-gmae build
[YOCTO #1070]
Currently with deb packaging, we have 2 issues when running
"bitbake meta-toolchain-gmae".
1) when MACHINE="qemux86", SDKMACHINE="i686", INSTALL_BASEARCH_DEB is "i686",
too. This causes the following ERROR:
| E: Couldn't find package task-sdk-host-nativesdk
NOTE: package meta-toolchain-gmae-1.0-r6: task do_populate_sdk: Failed
This is becasue: due to the DPKG_ARCH mapping, we create such a deb package
tmp/deploy/deb/i686-nativesdk/task-sdk-host-nativesdk_1.0-r10_i386.deb; dpkg
can't recoginze the package. We need to map INSTALL_BASEARCH_DEB in the same
way.
2) when MACHINE="qemux86", SDKMACHINE="x86_64", INSTALL_BASEARCH_DEB is
"x86_64", too.
We get such an ERROR:
| E: Couldn't find package task-cross-canadian-i586
NOTE: package meta-toolchain-gmae-1.0-r6: task do_populate_sdk: Failed
This is because: dpkg can't recognize the generated package
tmp/deploy/deb/x86_64-nativesdk/task-cross-canadian-i586_1.0-r0_i386.deb
Here the "i386" suffix is incorrect and should be "x86_64" -- the i386
comes from the line
DPKG_ARCH_i586 ?= "i386" in package_deb.bbclass.
However, for canadian package, actually here the overriding of DPKG (from
"x86-64" to "i386") should not happen -- it accidently happens just because
TARGET_ARCH exists in OVERRIDES. We can move the overriding logic to the
anonymous python function to work this around.
(From OE-Core rev: 63010b9ee89643c8e83656783231f0a7848d9e45)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-14 14:30:14 +00:00
|
|
|
export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}"
|
2011-08-01 17:11:22 +00:00
|
|
|
export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}"
|
2011-11-10 18:03:30 +00:00
|
|
|
export INSTALL_PACKAGES_DEB="${TOOLCHAIN_HOST_TASK}"
|
2012-06-21 20:11:53 +00:00
|
|
|
export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}"
|
2011-08-01 17:34:51 +00:00
|
|
|
export PACKAGES_LINGUAS_DEB=""
|
|
|
|
export INSTALL_TASK_DEB="populate_sdk-nativesdk"
|
2011-01-30 07:54:05 +00:00
|
|
|
|
|
|
|
package_install_internal_deb
|
|
|
|
populate_sdk_post_deb ${SDK_OUTPUT}/${SDKPATHNATIVE}
|
|
|
|
|
|
|
|
#move remainings
|
2011-09-19 08:00:38 +00:00
|
|
|
install -d ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/lib/dpkg
|
|
|
|
mv ${SDK_OUTPUT}/var/lib/dpkg/* ${SDK_OUTPUT}/${SDKPATHNATIVE}/var/lib/dpkg
|
2011-01-30 07:54:05 +00:00
|
|
|
rm -rf ${SDK_OUTPUT}/var
|
|
|
|
|
|
|
|
populate_sdk_log_check populate_sdk
|
|
|
|
}
|
|
|
|
|