[oe-commits] org.oe.dev merge of '1d9afcd1f3d90ea7abf5cfc1915392bf9edb076d'
hrw commit
openembedded-commits at lists.openembedded.org
Mon Aug 27 11:57:01 UTC 2007
merge of '1d9afcd1f3d90ea7abf5cfc1915392bf9edb076d'
and '26b8940ca9869ff7c4b384c11ddddffb98dc101d'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 2ab885ce843d1e5fc31c44ee5ba5e2e871d9dec5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2ab885ce843d1e5fc31c44ee5ba5e2e871d9dec5
Files:
1
conf/distro/include/angstrom-package-deb.inc
conf/distro/include/angstrom-package-ipk.inc
conf/distro/include/angstrom-package-rpm.inc
conf/distro/include/angstrom.inc
Diffs:
#
# mt diff -r1d9afcd1f3d90ea7abf5cfc1915392bf9edb076d -r2ab885ce843d1e5fc31c44ee5ba5e2e871d9dec5
#
#
#
# add_file "conf/distro/include/angstrom-package-deb.inc"
# content [8335e823a868d57d55708c602a26223d00ab6084]
#
# add_file "conf/distro/include/angstrom-package-ipk.inc"
# content [440a6b52c9a5ad608b32d2bbbd73a677595a08b1]
#
# add_file "conf/distro/include/angstrom-package-rpm.inc"
# content [765c4bf206ce98aa3df32967a2f3acd60e668558]
#
# patch "conf/distro/include/angstrom.inc"
# from [130b27cd1f01aa7501986af41f5aa3ec2ef4b767]
# to [cd8e6ee81497e36eceda2ade49b5706c6f03d464]
#
============================================================
--- conf/distro/include/angstrom-package-deb.inc 8335e823a868d57d55708c602a26223d00ab6084
+++ conf/distro/include/angstrom-package-deb.inc 8335e823a868d57d55708c602a26223d00ab6084
@@ -0,0 +1 @@
+INHERIT += "package_deb"
============================================================
--- conf/distro/include/angstrom-package-ipk.inc 440a6b52c9a5ad608b32d2bbbd73a677595a08b1
+++ conf/distro/include/angstrom-package-ipk.inc 440a6b52c9a5ad608b32d2bbbd73a677595a08b1
@@ -0,0 +1 @@
+INHERIT += "package_ipk"
============================================================
--- conf/distro/include/angstrom-package-rpm.inc 765c4bf206ce98aa3df32967a2f3acd60e668558
+++ conf/distro/include/angstrom-package-rpm.inc 765c4bf206ce98aa3df32967a2f3acd60e668558
@@ -0,0 +1 @@
+INHERIT += "package_rpm"
============================================================
--- conf/distro/include/angstrom.inc 130b27cd1f01aa7501986af41f5aa3ec2ef4b767
+++ conf/distro/include/angstrom.inc cd8e6ee81497e36eceda2ade49b5706c6f03d464
@@ -19,10 +19,13 @@ MAINTAINER = "Angstrom Developers <angst
#Set the default maintainer to angstrom-dev
MAINTAINER = "Angstrom Developers <angstrom-distro-devel at linuxtogo.org>"
-#use ipkg package format with debian style naming
+#use debian style naming
#use multimachine buildrules
-INHERIT += "package_ipk debian multimachine sanity devshell angstrom-mirrors insane"
+INHERIT += "debian multimachine sanity devshell angstrom-mirrors insane"
+ANGSTROM_PKG_FORMAT ?= "ipk"
+require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc
+
#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
PREFERRED_PROVIDER_qemu-native = "qemu-native"
ENABLE_BINARY_LOCALE_GENERATION ?= "1"
@@ -39,6 +42,167 @@ TARGET_FPU_ixp4xx ?= "soft"
TARGET_FPU_armeb ?= "soft"
TARGET_FPU_ixp4xx ?= "soft"
+#Set the right arch for the feeds
+#Alphabetically sorted
+
+FEED_ARCH ?= "${TARGET_ARCH}"
+
+#blackfin machines
+FEED_ARCH_bfin = "blackfin"
+
+#armv4t machines
+
+FEED_ARCH_acern30 = "armv4t"
+FEED_ARCH_amsdelta = "armv4t"
+FEED_ARCH_ep93xx = "armv4t"
+FEED_ARCH_eteng500 = "armv4t"
+FEED_ARCH_fic-gta01 = "armv4t"
+FEED_ARCH_fic-gta02 = "armv4t"
+FEED_ARCH_h1940 = "armv4t"
+FEED_ARCH_h6300 = "armv4t"
+FEED_ARCH_kb9202 = "armv4t"
+FEED_ARCH_ks8695 = "armv4t"
+FEED_ARCH_rx1950 = "armv4t"
+FEED_ARCH_rx3000 = "armv4t"
+FEED_ARCH_sarge-at91 = "armv4t"
+FEED_ARCH_smdk2440 = "armv4t"
+FEED_ARCH_smdk2443 = "armv4t"
+
+#armv5t machines
+
+FEED_ARCH_a1200 = "armv5te"
+FEED_ARCH_a780 = "armv5te"
+FEED_ARCH_akita = "armv5te"
+FEED_ARCH_asus620 = "armv5te"
+FEED_ARCH_asus730 = "armv5te"
+FEED_ARCH_at91sam9263ek = "armv5te"
+FEED_ARCH_aximx50 = "armv5te"
+FEED_ARCH_aximx50v = "armv5te"
+FEED_ARCH_c7x0 = "armv5te"
+FEED_ARCH_compulab-pxa270 = "armv5te"
+FEED_ARCH_davinci-dvevm = "armv5te"
+FEED_ARCH_devkitidp-pxa255 = "armv5te"
+FEED_ARCH_e680 = "armv5te"
+FEED_ARCH_er0100 = "armv5te"
+FEED_ARCH_gumstix = "armv5te"
+FEED_ARCH_gumstix-verdex = "armv5te"
+FEED_ARCH_gumstix-connex = "armv5te"
+FEED_ARCH_h1910 = "armv5te"
+FEED_ARCH_h2200 = "armv5te"
+FEED_ARCH_h3900 = "armv5te"
+FEED_ARCH_h4000 = "armv5te"
+FEED_ARCH_h5000 = "armv5te"
+FEED_ARCH_htcalpine = "armv5te"
+FEED_ARCH_htcapache = "armv5te"
+FEED_ARCH_htcblueangel = "armv5te"
+FEED_ARCH_htchimalaya = "armv5te"
+FEED_ARCH_htcsable = "armv5te"
+FEED_ARCH_htctornado = "armv5te"
+FEED_ARCH_htcuniversal = "armv5te"
+FEED_ARCH_hx2000 = "armv5te"
+FEED_ARCH_hx4700 = "armv5te"
+FEED_ARCH_ixp4xxle = "armv5te"
+FEED_ARCH_logicpd-pxa270 = "armv5te"
+FEED_ARCH_looxc550 = "armv5te"
+FEED_ARCH_lsarm = "armv5te"
+FEED_ARCH_magician = "armv5te"
+FEED_ARCH_mainstone = "armv5te"
+FEED_ARCH_mnci = "armv5te"
+FEED_ARCH_mtx-3 = "armv5te"
+FEED_ARCH_mx21ads = "armv5te"
+FEED_ARCH_n2100 = "armv5te"
+FEED_ARCH_navman-icn330 = "armv5te"
+FEED_ARCH_netbook-pro = "armv5te"
+FEED_ARCH_nokia770 = "armv5te"
+FEED_ARCH_rokre2 = "armv5te"
+FEED_ARCH_nslu2le = "armv5te"
+FEED_ARCH_omap1510inn = "armv5te"
+FEED_ARCH_omap1610h2 = "armv5te"
+FEED_ARCH_omap1710h3 = "armv5te"
+FEED_ARCH_omap5912osk = "armv5te"
+FEED_ARCH_palmld = "armv5te"
+FEED_ARCH_palmt650 = "armv5te"
+FEED_ARCH_palmt680 = "armv5te"
+FEED_ARCH_palmtc = "armv5te"
+FEED_ARCH_palmtt = "armv5te"
+FEED_ARCH_palmtt3 = "armv5te"
+FEED_ARCH_palmtt5 = "armv5te"
+FEED_ARCH_palmtx = "armv5te"
+FEED_ARCH_palmz31 = "armv5te"
+FEED_ARCH_palmz71 = "armv5te"
+FEED_ARCH_palmz72 = "armv5te"
+FEED_ARCH_poodle = "armv5te"
+FEED_ARCH_qemuarm = "armv5te"
+FEED_ARCH_spitz = "armv5te"
+FEED_ARCH_tosa = "armv5te"
+FEED_ARCH_triton = "armv5te"
+
+FEED_ARCH_ixp4xxbe = "armv5teb"
+FEED_ARCH_nslu2be = "armv5teb"
+
+# armv6
+
+FEED_ARCH_mx31ads = "armv6"
+FEED_ARCH_nokia800 = "armv6"
+FEED_ARCH_omap2420h4 = "armv6"
+FEED_ARCH_omap2430sdp = "armv6"
+
+#i486 machines
+FEED_ARCH_geodegx = "i486"
+FEED_ARCH_geodelx = "i486"
+FEED_ARCH_netvista = "i486"
+FEED_ARCH_wrap = "i486"
+FEED_ARCH_x86 = "i486"
+
+#i586 machines
+FEED_ARCH_epia = "i586"
+FEED_ARCH_i586-generic = "i586"
+FEED_ARCH_qemux86 = "i586"
+
+#i686 machines
+
+FEED_ARCH_alix = "i686"
+FEED_ARCH_colinux = "i686"
+FEED_ARCH_guinness = "i686"
+FEED_ARCH_i686-generic = "i686"
+FEED_ARCH_progear = "i686"
+
+#powerpc machines
+
+FEED_ARCH_dht-walnut = "ppc405"
+FEED_ARCH_magicbox = "ppc405"
+FEED_ARCH_xilinx-ml403 = "ppc405"
+FEED_ARCH_xilinx-ml410 = "ppc405"
+FEED_ARCH_sequoia = "ppc440e"
+FEED_ARCH_efika = "ppc603e"
+FEED_ARCH_lite5200 = "ppc603e"
+FEED_ARCH_lsppchd = "ppc603e"
+FEED_ARCH_lsppchg = "ppc603e"
+FEED_ARCH_storcenter = "ppc603e"
+FEED_ARCH_turbostation = "ppc603e"
+
+
+#strongarm machines, no EABI
+
+FEED_ARCH_collie = "arm-oabi"
+FEED_ARCH_h3600 = "arm-oabi"
+FEED_ARCH_h3800 = "arm-oabi"
+FEED_ARCH_htcwallaby = "arm-oabi"
+FEED_ARCH_jornada56x = "arm-oabi"
+FEED_ARCH_jornada7xx = "arm-oabi"
+FEED_ARCH_shark = "arm-oabi"
+FEED_ARCH_simpad = "arm-oabi"
+
+
+#Tweak packaging for strongarm machines since they can't use EABI
+
+PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi"
+
+
#Name the generated images in a sane way
IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROM_MODE}-${DISTRO_VERSION}-${MACHINE}"
DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
#
# mt diff -r26b8940ca9869ff7c4b384c11ddddffb98dc101d -r2ab885ce843d1e5fc31c44ee5ba5e2e871d9dec5
#
#
# no changes
#
More information about the Openembedded-commits
mailing list