From 50e0636adc6a88aba578524dfcbd6364e7f8eb93 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 17 Dec 2007 21:12:05 +0000 Subject: angstrom build release.sh: build base-image instead of minimal image per RFC on angstrom-devel mailinglist --- contrib/angstrom/build-release.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 1d778db69c..39108ad89b 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -37,14 +37,14 @@ for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk do BUILD_MACHINE=$machine BUILD_CLEAN="libtool-cross" - BUILD_TARGETS="minimal-image console-image" + BUILD_TARGETS="base-image console-image" do_build done for machine in ixp4xxle ixp4xxbe do BUILD_MACHINE=$machine - BUILD_TARGETS="minimal-image nslu2-base-image" + BUILD_TARGETS="base-image nslu2-base-image" do_build done @@ -60,7 +60,7 @@ done for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie do BUILD_MACHINE=$machine - BUILD_TARGETS="minimal-image console-image minimal-gpe-image x11-image" + BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image" do_build done -- cgit v1.2.3 From 3bbc20add46c22a5094b038b0ee0b20a83d9c80e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 18 Dec 2007 20:54:54 +0000 Subject: angstrom build release: base-files contains DISTRO_VERSION, so clean it to get the correct version into images * needs some more thought on how to get this correctly into the feeds --- contrib/angstrom/build-release.sh | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'contrib') diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 39108ad89b..8b30212790 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -32,17 +32,28 @@ do_report_success() { echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder.log } +#cross toolchain +#for machine in ep93xx a780 efika collie ixp4xxbe +#do +# BUILD_MACHINE=$machine +# BUILD_TARGETS="meta-toolchain" +# BUILD_CLEAN="meta-toolchain" +# do_build +#done + + # No graphics for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk do BUILD_MACHINE=$machine - BUILD_CLEAN="libtool-cross" + BUILD_CLEAN="libtool-cross base-files" BUILD_TARGETS="base-image console-image" do_build done for machine in ixp4xxle ixp4xxbe do + BUILD_CLEAN="base-files" BUILD_MACHINE=$machine BUILD_TARGETS="base-image nslu2-base-image" do_build @@ -51,6 +62,7 @@ done # build altboot images for zaurus for machine in c7x0 poodle tosa akita spitz collie do + BUILD_CLEAN="base-files" BUILD_MACHINE=$machine BUILD_TARGETS="altboot-console-image" do_build @@ -59,6 +71,7 @@ done # graphics, flash storage for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie do + BUILD_CLEAN="base-files" BUILD_MACHINE=$machine BUILD_TARGETS="base-image console-image minimal-gpe-image x11-image" do_build @@ -67,6 +80,7 @@ done # graphics, disk storage for machine in spitz do + BUILD_CLEAN="base-files" BUILD_MACHINE=$machine BUILD_TARGETS="x11-gpe-image x11-pimlico-image x11-office-image" do_build @@ -88,12 +102,3 @@ do do_build done -#cross toolchain -#for machine in ep93xx a780 efika collie ixp4xxbe -#do -# BUILD_MACHINE=$machine -# BUILD_TARGETS="meta-toolchain" -# BUILD_CLEAN="meta-toolchain" -# do_build -#done - -- cgit v1.2.3 From e4461ec98dcb9e3198d07a5de833455c0782f032 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 19 Dec 2007 10:40:24 +0000 Subject: angstrom build feed: replacement for meta-angstrom-2007 recipe, will be deprecated once the problems with the meta package get sorted out --- contrib/angstrom/build-feeds.sh | 56 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100755 contrib/angstrom/build-feeds.sh (limited to 'contrib') diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh new file mode 100755 index 0000000000..396350066c --- /dev/null +++ b/contrib/angstrom/build-feeds.sh @@ -0,0 +1,56 @@ +#!/bin/bash + +DO_UCLIBC=0 + +do_build() { + echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf + + BUILD_MODE="glibc" + if [ "$BUILD_CLEAN" != "" ] + then + bitbake -c clean $BUILD_CLEAN + fi + + for target in $BUILD_TARGETS + do + bitbake $target && do_report_success + done + + if [ $DO_UCLIBC = 1 ] + then + BUILD_MODE="uclibc" + echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf + for target in $BUILD_TARGETS + do + bitbake $target && do_report_success + done + fi +} + +do_report_success() { + + echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log +} + +for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie spitz +do + BUILD_MACHINE=$machine + BUILD_CLEAN="libtool-cross" + BUILD_TARGETS="gcc binutils automake autoconf m4 pkgconfig \ + task-proper-tools mc screen \ + mono perl python ruby \ + gtk+ qt-x11-free qt4-x11-free \ + gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \ + boa cherokee lighttpd thttpd \ + gpe-gallery gpe-scap pidgin \ + gpsdrive navit \ + xmms mplayer \ + wpa-gui wifi-radar \ + gpe-bluetooth bluez-gnome python-pybluez \ + abiword gnumeric evince gimp \ + flite \ + ctorrent \ + " + do_build +done + -- cgit v1.2.3 From f8bf8412979ba44c3a86b87dacfcc429d4327ece Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 20 Dec 2007 09:29:11 +0000 Subject: angstrom build-*: sync with autobuilder --- contrib/angstrom/build-feeds.sh | 8 ++++---- contrib/angstrom/build-release.sh | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'contrib') diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 396350066c..efa622d236 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -35,16 +35,16 @@ do_report_success() { for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie spitz do BUILD_MACHINE=$machine - BUILD_CLEAN="libtool-cross" + BUILD_CLEAN="libtool-cross qmake2-native" BUILD_TARGETS="gcc binutils automake autoconf m4 pkgconfig \ task-proper-tools mc screen \ mono perl python ruby \ gtk+ qt-x11-free qt4-x11-free \ gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \ - boa cherokee lighttpd thttpd \ - gpe-gallery gpe-scap pidgin \ + apache2 boa cherokee lighttpd thttpd \ + gpe-gallery gpe-scap notecase pidgin \ gpsdrive navit \ - xmms mplayer \ + xmms mplayer quasar \ wpa-gui wifi-radar \ gpe-bluetooth bluez-gnome python-pybluez \ abiword gnumeric evince gimp \ diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 8b30212790..6f86cfe728 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -95,10 +95,10 @@ do done # populate feeds -for machine in ep93xx a780 efika collie ixp4xxbe -do - BUILD_MACHINE=$machine - BUILD_TARGETS="meta-angstrom-2007" - do_build -done +#for machine in ep93xx a780 efika collie ixp4xxbe +#do +# BUILD_MACHINE=$machine +# BUILD_TARGETS="meta-angstrom-2007" +# do_build +#done -- cgit v1.2.3 From 77c63e9eecc886a043132e0d9518a94504949606 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 21 Dec 2007 09:02:15 +0000 Subject: angstrom build feeds: add more packages --- contrib/angstrom/build-feeds.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'contrib') diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index efa622d236..815a529441 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -35,21 +35,24 @@ do_report_success() { for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie spitz do BUILD_MACHINE=$machine - BUILD_CLEAN="libtool-cross qmake2-native" - BUILD_TARGETS="gcc binutils automake autoconf m4 pkgconfig \ + BUILD_CLEAN="libtool-cross qmake-native qmake2-native" + BUILD_TARGETS="texinfo gcc binutils automake autoconf m4 pkgconfig \ task-proper-tools mc screen \ mono perl python ruby \ gtk+ qt-x11-free qt4-x11-free \ gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \ + samba \ apache2 boa cherokee lighttpd thttpd \ gpe-gallery gpe-scap notecase pidgin \ - gpsdrive navit \ + roadmap-gtk2 gpsdrive navit \ xmms mplayer quasar \ - wpa-gui wifi-radar \ + wpa-gui wifi-radar kismet \ gpe-bluetooth bluez-gnome python-pybluez \ - abiword gnumeric evince gimp \ + abiword gnumeric evince epdfview gimp \ flite \ ctorrent \ + gnuplot octave fftw fftwf fftwl \ + gphoto2 gqview imagemagick ufraw \ " do_build done -- cgit v1.2.3 From a66ac67cd35d4aff5f98550e607a528d882e18f9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 22 Dec 2007 18:56:31 +0000 Subject: angstrom build-*: sync with autobuilder --- contrib/angstrom/build-feeds.sh | 12 +++++++----- contrib/angstrom/build-release.sh | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'contrib') diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 815a529441..fb117d6c11 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -32,27 +32,29 @@ do_report_success() { echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log } -for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie spitz +for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 do BUILD_MACHINE=$machine BUILD_CLEAN="libtool-cross qmake-native qmake2-native" - BUILD_TARGETS="texinfo gcc binutils automake autoconf m4 pkgconfig \ - task-proper-tools mc screen \ + BUILD_TARGETS="texinfo flex bison gcc binutils automake autoconf m4 pkgconfig \ + task-proper-tools mc screen emacs \ mono perl python ruby \ gtk+ qt-x11-free qt4-x11-free \ gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \ samba \ apache2 boa cherokee lighttpd thttpd \ - gpe-gallery gpe-scap notecase pidgin \ + gpe-gallery gpe-scap notecase \ + pidgin irssi \ roadmap-gtk2 gpsdrive navit \ xmms mplayer quasar \ - wpa-gui wifi-radar kismet \ + wpa-gui wifi-radar kismet aircrack-ng dsniff \ gpe-bluetooth bluez-gnome python-pybluez \ abiword gnumeric evince epdfview gimp \ flite \ ctorrent \ gnuplot octave fftw fftwf fftwl \ gphoto2 gqview imagemagick ufraw \ + tzdata \ " do_build done diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 6f86cfe728..54c9fb4fa4 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -69,7 +69,7 @@ do done # graphics, flash storage -for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie +for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie simpad do BUILD_CLEAN="base-files" BUILD_MACHINE=$machine -- cgit v1.2.3 From dd88e91fa3eefbd3b4fd6b352b388c20a9fe48e6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 22 Dec 2007 20:01:41 +0000 Subject: mtn2cl.sh: Quote args properly, or mtn chokes on "1 week ago". --- contrib/mtn2cl/mtn2cl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/mtn2cl/mtn2cl.sh b/contrib/mtn2cl/mtn2cl.sh index 416d393ccd..15d2722a8b 100755 --- a/contrib/mtn2cl/mtn2cl.sh +++ b/contrib/mtn2cl/mtn2cl.sh @@ -11,7 +11,7 @@ else export OLD_REV="l:\"1 week ago\"" fi -for i in `mtn log --brief --no-graph --no-merges --to ${OLD_REV} --from ${REV_NOW}| awk '{print $2 ":" $1}'` ; do \ +for i in `mtn log --brief --no-graph --no-merges --to "${OLD_REV}" --from "${REV_NOW}"| awk '{print $2 ":" $1}'` ; do \ export REV=`echo $i | awk -F: '{print $2}'` export AUTHOR=`echo $i | awk -F: '{print $1}'` export CL=`mtn ls certs ${REV} | grep -A 1 changelog | grep -v changelog | gawk -F'Value : ' '{ print $2 }'` -- cgit v1.2.3