summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-10-03 11:06:17 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-10-03 11:06:17 +0000
commitcc4882b8491bdb051f2c8ebf06109af206b33cb8 (patch)
treec31ff478db60b144e95b38407b41176ba91e3fb9
parentfb9b613fc93b6f6adbd9e5c8087516667e947008 (diff)
parent7a654187eec4d013b39ae56891b18e47b3e684ae (diff)
merge of '33fdbdf4099643f0cfc674de6234840544695efc'
and '8cbbaefc242a3db691387a4cdb4aca694ee0215f'
-rw-r--r--conf/distro/include/angstromoabi.inc2
-rwxr-xr-xcontrib/angstrom/build-feeds.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc
index bb7bc45fbd..81ffed71f8 100644
--- a/conf/distro/include/angstromoabi.inc
+++ b/conf/distro/include/angstromoabi.inc
@@ -1,4 +1,4 @@
require conf/distro/include/angstrom.inc
PACKAGE_ARCH = "arm-oabi"
-
+BASE_PACKAGE_ARCH = "arm-oabi"
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index bf640d872e..2b00692625 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -37,7 +37,7 @@ do_report_success() {
echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
}
-for machine in efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800
+for machine in beagleboard efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800
do
BUILD_MACHINE=$machine
BUILD_CLEAN="qmake-native qmake2-native qt-x11-free"