diff options
author | Chris Larson <kergoth@openedhand.com> | 2006-09-19 09:04:09 +0000 |
---|---|---|
committer | Chris Larson <kergoth@openedhand.com> | 2006-09-19 09:04:09 +0000 |
commit | 4fa2d11bb1fdb58ff426114169583672fc3d65b8 (patch) | |
tree | 0bd4952bbe057c3dc219be7e371a6a9d496c6535 /meta/conf/bitbake.conf | |
parent | 04f695333350e31fa87b7822c17a073af73fcd84 (diff) | |
download | poky-4fa2d11bb1fdb58ff426114169583672fc3d65b8.tar.gz |
Sync up.. all the deb/dpkg changes which I have locally are now in svn.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@728 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r-- | meta/conf/bitbake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2001586ff7..a4a3c754b9 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -57,7 +57,7 @@ TARGET_CC_ARCH = "" | |||
57 | 57 | ||
58 | PACKAGE_ARCH = "${HOST_ARCH}" | 58 | PACKAGE_ARCH = "${HOST_ARCH}" |
59 | MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" | 59 | MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" |
60 | IPKG_ARCHS = "all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}" | 60 | PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" |
61 | 61 | ||
62 | ################################################################## | 62 | ################################################################## |
63 | # Date/time variables. | 63 | # Date/time variables. |
@@ -159,6 +159,7 @@ DEPLOY_DIR = "${TMPDIR}/deploy" | |||
159 | DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" | 159 | DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" |
160 | DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" | 160 | DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" |
161 | DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" | 161 | DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" |
162 | DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" | ||
162 | 163 | ||
163 | ################################################################## | 164 | ################################################################## |
164 | # Kernel info. | 165 | # Kernel info. |