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 | |
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')
-rw-r--r-- | meta/conf/bitbake.conf | 3 | ||||
-rw-r--r-- | meta/conf/documentation.conf | 4 | ||||
-rw-r--r-- | meta/conf/machine/akita.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/cmx270.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/ixp4xx.conf | 10 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-iwmmxt.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/zaurus-clamshell.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/ipaq-pxa270.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/nokia770.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemux86.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/spitz.conf | 2 |
12 files changed, 18 insertions, 17 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. |
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index c07c8fa68b..699ac216eb 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf | |||
@@ -38,8 +38,8 @@ PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If y | |||
38 | machine dependant configuration options in your bitbake file add a \ | 38 | machine dependant configuration options in your bitbake file add a \ |
39 | PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.' | 39 | PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.' |
40 | 40 | ||
41 | IPKG_ARCHS[doc] = 'A list of architectures compatible with the given target in order of priority' | 41 | PACKAGE_ARCHS[doc] = 'A list of architectures compatible with the given target in order of priority' |
42 | IPKG_EXTRA_ARCHS[doc] = 'Set this variable to add extra architectures to the list of supported architectures' | 42 | PACKAGE_EXTRA_ARCHS[doc] = 'Set this variable to add extra architectures to the list of supported architectures' |
43 | 43 | ||
44 | DATE[doc] = "The date the build was started Ymd" | 44 | DATE[doc] = "The date the build was started Ymd" |
45 | TIME[doc] = "The time the build was started HMS" | 45 | TIME[doc] = "The time the build was started HMS" |
diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf index 0358864c70..0b0caebb3c 100644 --- a/meta/conf/machine/akita.conf +++ b/meta/conf/machine/akita.conf | |||
@@ -5,7 +5,7 @@ | |||
5 | include conf/machine/include/zaurus-clamshell.conf | 5 | include conf/machine/include/zaurus-clamshell.conf |
6 | include conf/machine/include/zaurus-clamshell-2.6.conf | 6 | include conf/machine/include/zaurus-clamshell-2.6.conf |
7 | 7 | ||
8 | IPKG_EXTRA_ARCHS += "iwmmxt" | 8 | PACKAGE_EXTRA_ARCHS += "iwmmxt" |
9 | IMAGE_FSTYPES ?= "jffs2" | 9 | IMAGE_FSTYPES ?= "jffs2" |
10 | 10 | ||
11 | ROOT_FLASH_SIZE = "58" | 11 | ROOT_FLASH_SIZE = "58" |
diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf index 2123d6294f..509da675ab 100644 --- a/meta/conf/machine/cmx270.conf +++ b/meta/conf/machine/cmx270.conf | |||
@@ -2,7 +2,7 @@ | |||
2 | #@NAME: Nokia 770 internet tablet | 2 | #@NAME: Nokia 770 internet tablet |
3 | #@DESCRIPTION: Machine configuration for the Compulab CM-X270 | 3 | #@DESCRIPTION: Machine configuration for the Compulab CM-X270 |
4 | TARGET_ARCH = "arm" | 4 | TARGET_ARCH = "arm" |
5 | IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te iwmmxt" | 5 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te iwmmxt" |
6 | 6 | ||
7 | EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n" | 7 | EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n" |
8 | 8 | ||
diff --git a/meta/conf/machine/include/ixp4xx.conf b/meta/conf/machine/include/ixp4xx.conf index 93befb92ce..e545bbc1c0 100644 --- a/meta/conf/machine/include/ixp4xx.conf +++ b/meta/conf/machine/include/ixp4xx.conf | |||
@@ -111,7 +111,7 @@ TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}" | |||
111 | # because everything built here is no more specific than that. | 111 | # because everything built here is no more specific than that. |
112 | MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}" | 112 | MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}" |
113 | 113 | ||
114 | # IPKG_EXTRA_ARCHS | 114 | # PACKAGE_EXTRA_ARCHS |
115 | # The full list of package architectures which should run on the system. | 115 | # The full list of package architectures which should run on the system. |
116 | # This takes into account both the board level issues and the INPUTS set | 116 | # This takes into account both the board level issues and the INPUTS set |
117 | # by the distro. The arm list is derived from the architecture settings | 117 | # by the distro. The arm list is derived from the architecture settings |
@@ -126,12 +126,12 @@ THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t$ | |||
126 | # NOTE: this list contains just the things which rootfs_ipk.bbclass does | 126 | # NOTE: this list contains just the things which rootfs_ipk.bbclass does |
127 | # not add, rootfs_ipk.bbclass evaluates: | 127 | # not add, rootfs_ipk.bbclass evaluates: |
128 | # | 128 | # |
129 | # ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}" | 129 | # ipkgarchs="all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" |
130 | # | 130 | # |
131 | # This is a priority ordered list - most desireable architecture at the end, | 131 | # This is a priority ordered list - most desireable architecture at the end, |
132 | # so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if | 132 | # so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if |
133 | # THUMB_INTERWORK precede this with the other architectures. | 133 | # THUMB_INTERWORK precede this with the other architectures. |
134 | IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \ | 134 | PACKAGE_EXTRA_ARCHS = "ixp4xx ${MACHINE} \ |
135 | ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ | 135 | ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ |
136 | (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \ | 136 | (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \ |
137 | + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \ | 137 | + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \ |
@@ -141,12 +141,12 @@ IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \ | |||
141 | bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} \ | 141 | bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes')} \ |
142 | ${MACHINE_ARCH} ${MACHINE}${ARCH_BYTE_SEX}" | 142 | ${MACHINE_ARCH} ${MACHINE}${ARCH_BYTE_SEX}" |
143 | 143 | ||
144 | # IPKG_ARCH_LIST [not used] | 144 | # PACKAGE_ARCH_LIST [not used] |
145 | # This is used to override the ipkgarchs settings in rootfs_ipk.bbclass, allowing | 145 | # This is used to override the ipkgarchs settings in rootfs_ipk.bbclass, allowing |
146 | # the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and | 146 | # the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and |
147 | # ixp4xx are included at the start (lower priority) as the non-byte-sex specific | 147 | # ixp4xx are included at the start (lower priority) as the non-byte-sex specific |
148 | # versions. | 148 | # versions. |
149 | IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}" | 149 | PACKAGE_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${PACKAGE_EXTRA_ARCHS}" |
150 | 150 | ||
151 | #------------------------------------------------------------------------------- | 151 | #------------------------------------------------------------------------------- |
152 | # Package versions | 152 | # Package versions |
diff --git a/meta/conf/machine/include/tune-iwmmxt.conf b/meta/conf/machine/include/tune-iwmmxt.conf index 990aee54bc..f9c8e7f5cf 100644 --- a/meta/conf/machine/include/tune-iwmmxt.conf +++ b/meta/conf/machine/include/tune-iwmmxt.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | # Configurations for the Intel PXA27x Appications Processor Family. | 1 | # Configurations for the Intel PXA27x Appications Processor Family. |
2 | # Please use tune-xscale for PXA255/PXA26x based processors. | 2 | # Please use tune-xscale for PXA255/PXA26x based processors. |
3 | IPKG_EXTRA_ARCHS += "iwmmxt" | 3 | PACKAGE_EXTRA_ARCHS += "iwmmxt" |
4 | TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" | 4 | TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" |
5 | PACKAGE_ARCH = "iwmmxt" | 5 | PACKAGE_ARCH = "iwmmxt" |
6 | 6 | ||
diff --git a/meta/conf/machine/include/zaurus-clamshell.conf b/meta/conf/machine/include/zaurus-clamshell.conf index e600a4926d..3c02f7bfd9 100644 --- a/meta/conf/machine/include/zaurus-clamshell.conf +++ b/meta/conf/machine/include/zaurus-clamshell.conf | |||
@@ -1,5 +1,5 @@ | |||
1 | TARGET_ARCH = "arm" | 1 | TARGET_ARCH = "arm" |
2 | IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" | 2 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" |
3 | 3 | ||
4 | PREFERRED_PROVIDER_xserver = "xserver-kdrive" | 4 | PREFERRED_PROVIDER_xserver = "xserver-kdrive" |
5 | 5 | ||
diff --git a/meta/conf/machine/ipaq-pxa270.conf b/meta/conf/machine/ipaq-pxa270.conf index bd92ad5dee..cc4aea4fb6 100644 --- a/meta/conf/machine/ipaq-pxa270.conf +++ b/meta/conf/machine/ipaq-pxa270.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices | 3 | #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices |
4 | 4 | ||
5 | TARGET_ARCH = "arm" | 5 | TARGET_ARCH = "arm" |
6 | IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700" | 6 | PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700" |
7 | 7 | ||
8 | #use this for a hx2xxx ipaq | 8 | #use this for a hx2xxx ipaq |
9 | PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" | 9 | PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" |
diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf index 690b2403d8..6cc73c9232 100644 --- a/meta/conf/machine/nokia770.conf +++ b/meta/conf/machine/nokia770.conf | |||
@@ -2,7 +2,7 @@ | |||
2 | #@NAME: Nokia 770 internet tablet | 2 | #@NAME: Nokia 770 internet tablet |
3 | #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet | 3 | #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet |
4 | TARGET_ARCH = "arm" | 4 | TARGET_ARCH = "arm" |
5 | IPKG_EXTRA_ARCHS = "armv4 armv5te" | 5 | PACKAGE_EXTRA_ARCHS = "armv4 armv5te" |
6 | 6 | ||
7 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" | 7 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" |
8 | PREFERRED_PROVIDER_virtual/bootloader = "" | 8 | PREFERRED_PROVIDER_virtual/bootloader = "" |
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index a64a58e9a2..2affa6693f 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation | 3 | #@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation |
4 | 4 | ||
5 | TARGET_ARCH = "arm" | 5 | TARGET_ARCH = "arm" |
6 | IPKG_EXTRA_ARCHS = "armv4 armv5te" | 6 | PACKAGE_EXTRA_ARCHS = "armv4 armv5te" |
7 | 7 | ||
8 | require conf/machine/include/qemu.conf | 8 | require conf/machine/include/qemu.conf |
9 | require conf/machine/include/tune-arm926ejs.conf | 9 | require conf/machine/include/tune-arm926ejs.conf |
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 83bf7391a9..63e318908e 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | TARGET_ARCH = "i586" | 5 | TARGET_ARCH = "i586" |
6 | TARGET_VENDOR = "-oe" | 6 | TARGET_VENDOR = "-oe" |
7 | IPKG_EXTRA_ARCHS = "x86" | 7 | PACKAGE_EXTRA_ARCHS = "x86" |
8 | 8 | ||
9 | require conf/machine/include/qemu.conf | 9 | require conf/machine/include/qemu.conf |
10 | # require conf/machine/include/tune-arm926ejs.conf | 10 | # require conf/machine/include/tune-arm926ejs.conf |
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf index af50217e0f..cf2c5f3f4f 100644 --- a/meta/conf/machine/spitz.conf +++ b/meta/conf/machine/spitz.conf | |||
@@ -7,7 +7,7 @@ include conf/machine/include/zaurus-clamshell-2.6.conf | |||
7 | 7 | ||
8 | PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" | 8 | PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" |
9 | 9 | ||
10 | IPKG_EXTRA_ARCHS += "iwmmxt" | 10 | PACKAGE_EXTRA_ARCHS += "iwmmxt" |
11 | IMAGE_FSTYPES ?= "tar.gz" | 11 | IMAGE_FSTYPES ?= "tar.gz" |
12 | 12 | ||
13 | ROOT_FLASH_SIZE = "100" | 13 | ROOT_FLASH_SIZE = "100" |