diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/angstrom/build-feeds.sh | 20 | ||||
| -rwxr-xr-x | contrib/angstrom/sort.sh | 7 | ||||
| -rw-r--r-- | contrib/angstrom/upload-packages.sh | 4 | ||||
| -rwxr-xr-x | contrib/oe-stylize.py | 1 |
4 files changed, 22 insertions, 10 deletions
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index f3f8c544c3..a3fe9b9e6b 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -61,10 +61,16 @@ do_build # * ppc603e: efika # * i586: qemux86 -for machine in simpad om-gta01 c7x0 ixp4xxbe nokia800 htckaiser beagleboard dht-walnut efika qemux86 +if [ "$1" = "" ] ; then + ARCH_MACHINES="simpad om-gta01 c7x0 ixp4xxbe nokia800 htckaiser beagleboard dht-walnut efika qemux86" +else + ARCH_MACHINES="$@" +fi + +for machine in ${ARCH_MACHINES} do BUILD_MACHINE=$machine - BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" BUILD_TARGETS=" \ abiword \ aircrack-ng \ @@ -341,6 +347,7 @@ do xserver-xorg \ zauralign \ zddice \ + zenity \ zgscore \ zhone \ ziq \ @@ -356,11 +363,16 @@ done # machine packages (machine specific (sub)packages) -for machine in overo omap3-pandora beagleboard omap3evm neuros-osd2 efika dht-walnut palmt650 omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 dns323 mv2120 kuropro lspro tsx09 ts409 qemux86 +if [ "$1" = "" ] ; then + MACHINES="simpad om-gta01 c7x0 ixp4xxbe nokia800 htckaiser beagleboard dht-walnut efika qemux86" +else + MACHINES="$@" +fi +for machine in ${MACHINES} do BUILD_MACHINE=$machine - BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" BUILD_TARGETS="task-base task-boot \ task-opie task-opie-all \ task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \ diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index a1a4882480..e53b3d859f 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -48,7 +48,7 @@ case "$arch" in "armv4t") machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;; "armv5te") - machines="topas910 sheevaplug dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;; + machines="dm6446-evm dm6467-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa" ;; "armv5teb") machines="ixp4xxbe nslu2be" ;; "armv6-novfp") @@ -150,9 +150,10 @@ echo "Processing 'all' feed" for i in `find . -name "*.ipk"| grep _all` ; do mkdir -p ../all/ || true ;mv $i ../all/ ; done (mkdir -p ../all ; cd ../all && ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig ) -rm *x86_64* +mkdir -p ../sdk ; mv *sdk.ipk ../sdk/ || true + (mkdir -p ../sdk ; cd ../sdk && ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig ) -for arch in arm-oabi armv4t armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc ; do +for arch in arm-oabi armv4t armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e sparc x86_64 ; do do_sort done diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index 37d8c9ac9b..593cf13fba 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -8,7 +8,7 @@ REMOTEM=angstrom@linuxtogo.org # Feed dir we want to upload to -REMOTED=website/feeds/2008/ipk/$(basename $PWD) +REMOTED=website/feeds/unstable/ipk/$(basename $PWD) # create upload dir mkdir -p upload-queue || true @@ -36,7 +36,7 @@ rm -f upload-queue/ti*codec* upload-queue/*3.00.* # Copy over non-duplicate files echo "Starting rsync..." -rsync -vz --copy-links --progress --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/ +rsync -vz --partial --copy-links --progress --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/ # Clean up temporary files echo "Removing upload queue" diff --git a/contrib/oe-stylize.py b/contrib/oe-stylize.py index 5658c1662d..21e02adbf3 100755 --- a/contrib/oe-stylize.py +++ b/contrib/oe-stylize.py @@ -195,7 +195,6 @@ OE_vars = [ 'UBOOT_MACHINE', 'UCLIBC_BASE', 'UCLIBC_PATCHES', - 'UNSLUNG_PACKAGES', 'VIRTUAL_NAME', 'XORG_PN', 'XSERVER', |