diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/angstrom/build-feeds.sh | 30 | ||||
| -rwxr-xr-x | contrib/angstrom/omap3-mkcard.sh | 52 | ||||
| -rwxr-xr-x | contrib/angstrom/sort.sh | 10 | ||||
| -rw-r--r-- | contrib/angstrom/upload-packages.sh | 3 | ||||
| -rw-r--r-- | contrib/multitech/env-oe.sh | 15 | ||||
| -rw-r--r-- | contrib/multitech/local.conf | 139 | ||||
| -rw-r--r-- | contrib/multitech/ppp-masq-fw | 34 | ||||
| -rw-r--r-- | contrib/multitech/uboot-setenv | 59 | ||||
| -rwxr-xr-x | contrib/python/generate-manifest-2.6.py | 2 | ||||
| -rwxr-xr-x | contrib/source-checker/bump.preferred-xorg-versions-7.5.sh | 75 | ||||
| -rwxr-xr-x | contrib/source-checker/bump.preferred-xorg-versions-live.sh | 75 |
11 files changed, 485 insertions, 9 deletions
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 7f3dff0dd3..73a0d481cf 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -70,20 +70,24 @@ fi for machine in ${ARCH_MACHINES} do BUILD_MACHINE=$machine - BUILD_CLEAN="qmake-native qmake2-native qt-x11-free iso-codes perl perl-native python python-native python-pygtk gnome-icon-theme" + BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free iso-codes perl perl-native python python-native python-pygtk gnome-icon-theme" BUILD_TARGETS=" \ + opkg-native \ abiword \ aircrack-ng \ angstrom-task-gnome \ angstrom-zeroconf-audio \ apache2 \ artoolkit \ + asciidoc \ asterisk \ atomic \ autoconf \ automake \ + balsa \ binutils \ bison \ + blueman \ bluez-gnome \ bluez-hcidump \ boa \ @@ -97,6 +101,7 @@ do connman \ connman-gnome \ contacts \ + cpufrequtils \ cron \ cvs \ cwiid \ @@ -116,9 +121,12 @@ do e-wm \ ekiga \ empathy \ + eog \ epdfview \ epiphany \ evince \ + exalt \ + exalt-client \ exo \ fakeroot \ fennec \ @@ -143,6 +151,7 @@ do gdb \ gdbserver \ gdm \ + geany \ geda \ geda-docs \ geda-examples \ @@ -152,10 +161,13 @@ do geda-gsymcheck \ geda-symbols \ geda-utils \ + giac \ gimp \ glider \ + gksu \ gmp \ gmpc \ + gnome-dvb-daemon \ gnome-games \ gnome-mplayer \ gnome-panel \ @@ -188,6 +200,7 @@ do iaimaster \ icebloxx \ imagemagick \ + inkscape \ inkwp \ ioquake3 \ ipaq-sleep \ @@ -232,19 +245,26 @@ do mplayer \ mtd-utils \ mutt \ + mysql5 \ mythtv \ + mythplugins \ + myththemes \ + nano \ nautilus \ nbench-byte \ navit \ + netbook-launcher-efl \ netkit-ftp \ netsurf \ news \ + nfs-utils \ nmap \ nmm \ notecase \ ntfs-3g \ numptyphysics \ octave \ + openbox \ opencv \ opencv-samples \ openmoko-browser2 \ @@ -256,9 +276,11 @@ do pavucontrol \ palantir \ pairs \ + paprefs \ pciutils \ pdamaze \ perl \ + php \ pidgin \ pine \ pingus \ @@ -295,6 +317,7 @@ do screen \ scummvm \ sdlquake \ + sdrshell \ sensors-applet \ setserial \ shisensho \ @@ -307,6 +330,7 @@ do subversion \ sugar \ sylpheed \ + sysstat \ systray \ task-beagleboard-demo \ task-gpe-pim \ @@ -318,6 +342,7 @@ do task-xqtlauncher \ tasks \ texinfo \ + tgt \ thttpd \ thunar \ tightvnc \ @@ -333,6 +358,7 @@ do usbutils \ usbview \ ushare \ + vdr \ viking \ vlc \ vpnc \ @@ -344,7 +370,9 @@ do wscan \ wt \ wt3 \ + wvdial \ x11vnc \ + xclip \ xf86-input-evdev \ xf86-input-evtouch \ xf86-input-keyboard \ diff --git a/contrib/angstrom/omap3-mkcard.sh b/contrib/angstrom/omap3-mkcard.sh new file mode 100755 index 0000000000..dc4359c38c --- /dev/null +++ b/contrib/angstrom/omap3-mkcard.sh @@ -0,0 +1,52 @@ +#! /bin/sh +# mkcard.sh v0.4 +# (c) Copyright 2009 Graeme Gregory <dp@xora.org.uk> +# Licensed under terms of GPLv2 +# +# Parts of the procudure base on the work of Denys Dmytriyenko +# http://wiki.omap.com/index.php/MMC_Boot_Format + +LC_ALL=C + +if [ $# -ne 1 ]; then + echo "Usage: $0 <drive>" + exit 1; +fi + +DRIVE=$1 + +dd if=/dev/zero of=$DRIVE bs=1024 count=1024 + +SIZE=`fdisk -l $DRIVE | grep Disk | awk '{print $5}'` + +echo DISK SIZE - $SIZE bytes + +CYLINDERS=`echo $SIZE/255/63/512 | bc` + +echo CYLINDERS - $CYLINDERS + +{ +echo ,9,0x0C,* +echo ,,,- +} | sfdisk -D -H 255 -S 63 -C $CYLINDERS $DRIVE + +if [ -b ${DRIVE}1 ]; then + mkfs.vfat -F 32 -n "boot" ${DRIVE}1 +else + if [ -b ${DRIVE}p1 ]; then + mkfs.vfat -F 32 -n "boot" ${DRIVE}p1 + else + echo "Cant find boot partition in /dev" + fi +fi + +if [ -b ${DRIVE}2 ]; then + mke2fs -j -L "rootfs" ${DRIVE}2 +else + if [ -b ${DRIVE}p2 ]; then + mke2fs -j -L "rootfs" ${DRIVE}p2 + else + echo "Cant find rootfs partition in /dev" + fi +fi + diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh index 758fee9acd..4cb9c23ebe 100755 --- a/contrib/angstrom/sort.sh +++ b/contrib/angstrom/sort.sh @@ -43,22 +43,22 @@ do_sort() { archdir=$arch case "$arch" in - "arm-oabi") + "armv4") machines="h3600 h3800 collie simpad htcwallaby" ;; "armv4t") machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;; "armv5te") - machines="da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client 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 mx27ads at91sam9g20ek mainstone" ;; + machines="hawkboard da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm6467t-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug openrd-client openrd-base 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 mx27ads at91sam9g20ek mainstone" ;; "armv5teb") machines="ixp4xxbe nslu2be" ;; "armv6-novfp") machines="htcdiamond htckaiser htcpolaris htcraphael htcvogue" ;; "armv6") - machines="bug mx31ads nokia800 " ;; + machines="smartq5 bug mx31ads nokia800 " ;; "armv7") machines="" ;; "armv7a") - machines="igep0020 omap3-touchbook beagleboard omap3evm am3517-evm omap3517-evm omap3-pandora omapzoom omapzoom2 overo" ;; + machines="archos5 palmpre cm-t35 igep0020 omap3-touchbook beagleboard omap3evm am3517-evm omap3517-evm omap3-pandora omapzoom omapzoom2 overo" ;; "avr32") machines="atngw100 at32stk1000" ;; "bfin") @@ -165,7 +165,7 @@ for i in `find . -name "*.ipk"| grep _all` ; do mkdir -p ../all/ || true ;mv $i 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 ppce300c3 ppce500 sparc x86_64 ; do +for arch in armv4 armv4t armv5teb armv5te armv6-novfp armv6 armv7a armv7 avr32 bfin geode i486 i586 i686 iwmmxt ppc405 ppc603e ppce300c3 ppce500 sparc x86_64 ; do do_sort done diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index 5f33b46090..20c1187144 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -31,8 +31,7 @@ echo "Checking for duplicates" cat files-remote files-local | sort | uniq -u >files-uniq cat files-uniq files-local | sort | uniq -d > files-trans -# Remove SGX files -rm -f upload-queue/bigbuck* upload-queue/*libgles* upload-queue/*kdrive*sgx* upload-queue/*3.00.* +rm -f upload-queue/bigbuck* # Copy over non-duplicate files echo "Starting rsync..." diff --git a/contrib/multitech/env-oe.sh b/contrib/multitech/env-oe.sh new file mode 100644 index 0000000000..17e37a786a --- /dev/null +++ b/contrib/multitech/env-oe.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +export OETREE=$(pwd) + +if [[ ! "${PATH}" =~ ${OETREE}/bitbake/bin ]]; then + export PATH=${OETREE}/bitbake/bin:${PATH} +fi + +# define if you wish to create soft links to the image in the tftpboot dir +#export TFTPBOOT_DIR=/tftpboot + +export BBPATH=${OETREE}/build:${OETREE}/openembedded +export BB_ENV_EXTRAWHITE="MACHINE DISTRO OETREE ANGSTROM_MODE ANGSTROMLIBC LIBC TFTPBOOT_DIR" + + diff --git a/contrib/multitech/local.conf b/contrib/multitech/local.conf new file mode 100644 index 0000000000..3d63bb6452 --- /dev/null +++ b/contrib/multitech/local.conf @@ -0,0 +1,139 @@ +# +# Multi-Tech OpenEmbedded config +# +# Please visit the Wiki at http://openembedded.org/ for more info. +# +# WARNING: lines starting with a space (' ') will result in parse failures. +# Remove '# ' from commented lines to activate them. +# +# NOTE: Do NOT use $HOME in your paths, BitBake does NOT expand ~ for you. If you +# must have paths relative to your homedir use ${HOME} (note the {}'s there +# you MUST have them for the variable expansion to be done by BitBake). Your +# paths should all be absolute paths (They should all start with a / after +# expansion. Stuff like starting with ${HOME} or ${TOPDIR} is ok). + +# Use this to specify where BitBake should place the downloaded sources into +DL_DIR = "${OETREE}/sources" + +# Uncomment below to prepend user-collection dir to search path for file:// +#FILESPATHBASE =. "${OETREE}/user-collection/files:" + +# Paths to bitbake files +BBFILES = "${OETREE}/openembedded/recipes/*/*.bb ${OETREE}/user-collection/recipes/*/*.bb" + +# Setup bitbake overlays and priorities +BBFILE_COLLECTIONS = "upstream local" +BBFILE_PATTERN_upstream = "^${OETREE}/openembedded/" +BBFILE_PATTERN_local = "^${OETREE}/user-collection/" +BBFILE_PRIORITY_upstream = "1" +BBFILE_PRIORITY_local = "10" + +# Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files +# This is a regular expression, so be sure to get your parenthesis balanced. +BBMASK = "" + +# Uncomment this if you want to use a prebuilt toolchain. You will need to +# provide packages for toolchain and additional libraries yourself. You also +# have to set PATH in your environment to make sure BitBake finds additional binaries. +# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" + +# Uncomment this if you're building for an arch that uses emulated locale +# generation under qemu (mainly arm glibc) and have an external gcc 3.x compiler +# that OE recognises. This will mean the gcc-native build is skipped, speeding +# builds up. +# ASSUME_PROVIDED += "gcc3-native" + +# Select between multiple alternative providers, if more than one is eligible. +PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie" +PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" + +# Uncomment this to specify where BitBake should create its temporary files. +# Note that a full build of everything in OpenEmbedded will take GigaBytes of hard +# disk space, so make sure to free enough space. The default TMPDIR is +# <build directory>/tmp +# Don't use symlinks in in the path to avoid problems +TMPDIR = "${OETREE}/build/tmp" + +# Set machine type, which also sets TARGET_ARCH +MACHINE = "mtcdp" + +# Use Multi-Tech CoreCDP distribution +DISTRO = "corecdp" + +# So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION +# to generate binary locale packages at build time using qemu-native and +# thereby guarantee i18n support on all devices. If your build breaks on +# qemu-native consider disabling ENABLE_BINARY_LOCALE_GENERATION (note that +# this breaks i18n on devices with less than 128MB RAM) or installing +# a working third-party qemu (e.g. provided by your distribution) and +# adding qemu-native to ASSUME_PROVIDED. Caveat emptor, since third-party +# qemus lack patches needed to work with various OE targets. +ENABLE_BINARY_LOCALE_GENERATION = "0" +# ASSUME_PROVIDED += "qemu-native" + +# If ENABLE_BINARY_LOCALE_GENERATION is set to "1", you can limit locales +# generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge +# time-savior for developmental builds. Format: list of locale.encoding pairs +# with spaces as separators. +# GLIBC_GENERATE_LOCALES = "en_US.UTF-8 en_GB.UTF-8 de_DE.UTF-8" + +# Add the required image file system types below. Valid are +# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz) +# squashfs, squashfs-lzma +IMAGE_FSTYPES = "jffs2 tar" + +# Uncomment this if you want to keep the temporary rootfs +# diretory, this can be useful during development. +# (Note that this rootfs is NOT usuable as NFS export.) +IMAGE_KEEPROOTFS = "1" + +# Uncomment this to remove unpacked source and intermediate work +# after successfully building a package. +# Saves a LOT of disk space, but leaving work around is useful for debugging. +# INHERIT += "rm_work" + +# Uncomment this if you want BitBake to emit debugging output +# BBDEBUG = "yes" + +# Uncomment these two if you want BitBake to build images useful for debugging. +# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined. +# Also note that OE now produces -dbg packages which contain debugging symbols. +# DEBUG_BUILD = "1" +# INHIBIT_PACKAGE_STRIP = "1" + +# Uncomment these to build a package such that you can use gprof to profile it. +# NOTE: This will only work with 'linux' targets, not +# 'linux-uclibc', as uClibc doesn't provide the necessary +# object files. Also, don't build glibc itself with these +# flags, or it'll fail to build. +# +# PROFILE_OPTIMIZATION = "-pg" +# SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}" +# LDFLAGS =+ "-pg" + +# Uncomment this to enable parallel make. +# This allows make to spawn mutliple processes to take advantage of multiple +# processors. Useful on SMP machines. This may break some packages - we're +# in the process of marking these so let us know if you find any. +PARALLEL_MAKE = "-j 2" + +# Uncomment to run multiple bitbake threads in parallel. +# Bitbake can do multiple jobs in parallel: Its a good idea make use of +# all available resources: e.g. to download sources while some other +# piece of software is compiled. +BB_NUMBER_THREADS = "2" + +# Uncomment this if you want BitBake to emit the log if a build fails. +BBINCLUDELOGS = "yes" + +# Specifies a location to search for pre-generated tarballs when fetching +# a cvs:// URI. Outcomment this, if you always want to pull directly from CVS. +#CVS_TARBALL_STASH = "" + +# Uncomment this if you want to install shared libraries directly under their SONAME, +# rather than installing as the full version and symlinking to the SONAME. +# PACKAGE_SNAP_LIB_SYMLINKS = "1" diff --git a/contrib/multitech/ppp-masq-fw b/contrib/multitech/ppp-masq-fw new file mode 100644 index 0000000000..f8b971808d --- /dev/null +++ b/contrib/multitech/ppp-masq-fw @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +# Flush all the tables first +iptables -t filter -F +iptables -t nat -F +iptables -t mangle -F + +iptables -t filter -P INPUT DROP +iptables -t filter -A INPUT -i lo -j ACCEPT +iptables -t filter -A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT + +# Accept ssh from the LAN (Wired) +iptables -t filter -A INPUT -i eth0 -p tcp --dport 22 -j ACCEPT +# Accept http from the LAN (Wired) +iptables -t filter -A INPUT -i eth0 -p tcp --dport 80 -j ACCEPT +# Accept tftp from the LAN (Wired) +#iptables -t filter -A INPUT -i eth0 -p udp --dport 69 -j ACCEPT + +# Accept ssh from the WAN (Wireless) +#iptables -t filter -A INPUT -i ppp0 -p tcp --dport 22 -j ACCEPT +# Accept http from the WAN (Wireless) +#iptables -t filter -A INPUT -i ppp0 -p tcp --dport 80 -j ACCEPT + +iptables -t filter -P FORWARD DROP +iptables -t filter -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT +iptables -t filter -A FORWARD -i eth0 -o ppp0 -j ACCEPT + +iptables -t filter -P OUTPUT ACCEPT + +iptables -t nat -A POSTROUTING -o ppp0 -j MASQUERADE + +# turn on packet forwarding last +echo 1 > /proc/sys/net/ipv4/ip_forward + diff --git a/contrib/multitech/uboot-setenv b/contrib/multitech/uboot-setenv new file mode 100644 index 0000000000..f07f7c18ae --- /dev/null +++ b/contrib/multitech/uboot-setenv @@ -0,0 +1,59 @@ +print setting U-Boot variables... +send setenv bootargs \'mem=64M console=ttyS0,115200 root=/dev/mtdblock8 ro rootfstype=jffs2\' +send setenv bootcmd \'nboot.jffs2 ${loadaddr} 0 ${kernel_addr}; bootm ${loadaddr}\' +send setenv bootdelay 3 +send setenv ipaddr 192.168.2.1 +send setenv netmask 255.255.255.0 +send setenv hostname MTCDP +send setenv serverip 192.168.2.2 +send setenv dnsip 192.168.2.3 +send setenv stdin serial +send setenv stdout serial +send setenv stderr serial +send setenv ethact macb0 +send setenv loadaddr 0x21400000 +send setenv bootstrap_file oe_bootstrap.bin +send setenv uboot_file oe_u-boot.bin +send setenv uboot_env1_file oe_uboot_env1.bin +send setenv uboot_env2_file oe_uboot_env2.bin +send setenv kernel_file oe_uImage.bin +send setenv config_file oe_config.tar.gz +send setenv oem_file oe_oem.tar.gz +send setenv rootfs_file oe_rootfs.jffs2 +send setenv bootstrap_addr 0x00000000 +send setenv uboot_addr 0x00020000 +send setenv uboot_env1_addr 0x00060000 +send setenv uboot_env2_addr 0x00080000 +send setenv kernel_addr 0x000A0000 +send setenv config_addr 0x00800000 +send setenv oem_addr 0x01000000 +send setenv rootfs_addr 0x01800000 +send setenv bootstrap_size 0x00020000 +send setenv uboot_size 0x00040000 +send setenv uboot_env1_size 0x00020000 +send setenv uboot_env2_size 0x00020000 +send setenv kernel_size 0x00760000 +send setenv config_size 0x00800000 +send setenv oem_size 0x00800000 +send setenv erase_bootstrap \'nand erase ${bootstrap_addr} ${bootstrap_size}\' +send setenv erase_uboot \'nand erase ${uboot_addr} ${uboot_size}\' +send setenv erase_uboot_env1 \'nand erase ${uboot_env1_addr} ${uboot_env1_size}\' +send setenv erase_uboot_env2 \'nand erase ${uboot_env2_addr} ${uboot_env2_size}\' +send setenv erase_kernel \'nand erase ${kernel_addr} ${kernel_size}\' +send setenv erase_config \'nand erase ${config_addr} ${config_size}\' +send setenv erase_oem \'nand erase ${oem_addr} ${oem_size}\' +send setenv erase_rootfs \'nand erase ${rootfs_addr}\' +send setenv tftp_bootstrap \'tftp ${loadaddr} ${bootstrap_file}; run erase_bootstrap; nand write.jffs2 ${fileaddr} ${bootstrap_addr} ${filesize}\' +send setenv tftp_uboot \'tftp ${loadaddr} ${uboot_file}; run erase_uboot; nand write.jffs2 ${fileaddr} ${uboot_addr} ${filesize}\' +send setenv tftp_uboot_env1 \'tftp ${loadaddr} ${uboot_env1_file}; run erase_uboot_env1; nand write.jffs2 ${fileaddr} ${uboot_env1_addr} ${filesize}\' +send setenv tftp_uboot_env2 \'tftp ${loadaddr} ${uboot_env2_file}; run erase_uboot_env2; nand write.jffs2 ${fileaddr} ${uboot_env2_addr} ${filesize}\' +send setenv tftp_kernel \'tftp ${loadaddr} ${kernel_file}; run erase_kernel; nand write.jffs2 ${fileaddr} ${kernel_addr} ${filesize}\' +send setenv tftp_config \'tftp ${loadaddr} ${config_file}; run erase_config; nand write.jffs2 ${fileaddr} ${config_addr} ${filesize}\' +send setenv tftp_oem \'tftp ${loadaddr} ${oem_file}; run erase_oem; nand write.jffs2 ${fileaddr} ${oem_addr} ${filesize}\' +send setenv tftp_rootfs \'tftp ${loadaddr} ${rootfs_file}; run erase_rootfs; nand write.jffs2 ${fileaddr} ${rootfs_addr} ${filesize}\' +send setenv krb \'run tftp_kernel; run tftp_rootfs; boot\' +send setenv rb \'run tftp_rootfs; boot\' +print saving... +send saveenv +send saveenv +send printenv diff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.py index fe0e38596b..890d1c066d 100755 --- a/contrib/python/generate-manifest-2.6.py +++ b/contrib/python/generate-manifest-2.6.py @@ -248,7 +248,7 @@ if __name__ == "__main__": m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math", "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " + - "pipes.* socket.* tempfile.* StringIO.* " ) + "pipes.* socket.* ssl.* tempfile.* StringIO.* " ) m.addPackage( "python-json", "Python JSON Support", "python-core python-math python-re", "json" ) # package diff --git a/contrib/source-checker/bump.preferred-xorg-versions-7.5.sh b/contrib/source-checker/bump.preferred-xorg-versions-7.5.sh new file mode 100755 index 0000000000..07fa914ee2 --- /dev/null +++ b/contrib/source-checker/bump.preferred-xorg-versions-7.5.sh @@ -0,0 +1,75 @@ +#!/bin/bash +DATE=`date +%Y%m%d` +SCRDIR=`dirname $0` +DIR=${SCRDIR}/${DATE} +PREFIX=http://www.x.org/releases/X11R7.5/src/ +GRPS="app data doc driver font lib proto util xserver" +OETREE=${SCRDIR}/../.. +PREFS_LIVE=${OETREE}/conf/distro/include/preferred-xorg-versions-X11R7.5-live.inc +BBS=${OETREE}/recipes/xorg- +OUT_LOG=${DIR}.log +OUT_CMD=${DIR}.cmd + +export LC_ALL=c + +mkdir -p ${DIR} + +function latest { + IN=$1 + OUT=$2 + echo "Parsing latest from ${IN} to ${OUT}" + sed "s/<a href=\"/\nPKG=/g" ${IN} | grep "^PKG=" | sed "s/^\([^\"]*\)\">.*$/\1/g" | grep "bz2$" | sort -V > ${IN}.tmp + for PKG in `sed "s/^\(.*\)-\([^-]*\)$/\1/g" ${IN}.tmp | sort -u`; do + grep ${PKG} ${IN}.tmp | tail -n 1 | sed 's/xorg-server/xserver-xorg/g' >> ${OUT}; + done +} + +function updateVersions { + PKG=$1 + GRP=$2 + VER=$3 + BB_VER=`ls -1 ${BBS}${GRP}/${PKG}_*.bb 2>/dev/null | sed "s%${BBS}${GRP}/${PKG}_%%g; s%.bb$%%g" | grep -v X11R7.0 | grep -v cvs | grep -v git | grep -v svn | sort -V | tail -n 1` + #echo ${GRP}/${PKG}/${VER} ${PREF_VER} ${BB_VER} + if ls -1 ${BBS}${GRP}/${PKG}_*.bb >/dev/null 2>/dev/null ; then + echo "PREFERRED_VERSION_${PKG} ?= \"${VER}\"" >> ${PREFS_LIVE} + fi + if [[ -n ${BB_VER} && ${BB_VER} != ${VER} ]] ; then + echo "bump: $GRP ${PKG} ${BB_VER} -> ${VER}" | tee -a ${OUT_LOG} + echo "cp ${BBS}${GRP}/${PKG}_${BB_VER}.bb ${BBS}${GRP}/${PKG}_${VER}.bb" >> ${OUT_CMD} + fi + if [[ -z ${BB_VER} ]] ; then + echo "new ${GRP} ${PKG}/${VER}" | tee -a ${OUT_LOG} + fi +} + +for GRP in ${GRPS}; do + if [[ ! -e ${DIR}/${GRP}.html ]] ; then + wget ${PREFIX}/${GRP} -O ${DIR}/${GRP}.html + fi + latest ${DIR}/${GRP}.html ${DIR}/${GRP}.txt + echo "#${GRP}" >> ${DIR}/latest.txt + sed "s/PKG=/${GRP}\//g; s/-\([^-]*\).tar.bz2$/\/\1/g;" ${DIR}/${GRP}.txt | gawk '{ print tolower($0) }' >> ${DIR}/latest.txt +done + +sort -u ${DIR}/latest.txt > ${DIR}/latest.sort.txt + +echo "#`date`" > ${PREFS_LIVE} + +echo "#`date`" > ${OUT_LOG} +echo "#`date`" > ${OUT_CMD} + +cat ${DIR}/latest.txt | while read LINE; do + if [[ ${LINE} =~ \#.* ]]; then + echo ${LINE} >> ${PREFS_LIVE} + continue + fi + #echo ${LINE}; + PKG=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\2%g;"` + GRP=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\1%g;"` + VER=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\3%g;"` + updateVersions ${PKG} ${GRP} ${VER} + updateVersions ${PKG}-native ${GRP} ${VER} +done + +echo "Check ${OUT_LOG} if there is something new and interesting" +echo "You can update prefs or copy bbfiles with commands from ${OUT_CMD}" diff --git a/contrib/source-checker/bump.preferred-xorg-versions-live.sh b/contrib/source-checker/bump.preferred-xorg-versions-live.sh new file mode 100755 index 0000000000..63ae0f4b28 --- /dev/null +++ b/contrib/source-checker/bump.preferred-xorg-versions-live.sh @@ -0,0 +1,75 @@ +#!/bin/bash +DATE=`date +%Y%m%d` +SCRDIR=`dirname $0` +DIR=${SCRDIR}/${DATE} +PREFIX=http://xorg.freedesktop.org/releases/individual/ +GRPS="app data doc driver font lib proto util xserver" +OETREE=${SCRDIR}/../.. +PREFS_LIVE=${OETREE}/conf/distro/include/preferred-xorg-versions-live.inc +BBS=${OETREE}/recipes/xorg- +OUT_LOG=${DIR}.log +OUT_CMD=${DIR}.cmd + +export LC_ALL=c + +mkdir -p ${DIR} + +function latest { + IN=$1 + OUT=$2 + echo "Parsing latest from ${IN} to ${OUT}" + sed "s/<a href=\"/\nPKG=/g" ${IN} | grep "^PKG=" | sed "s/^\([^\"]*\)\">.*$/\1/g" | grep "bz2$" | sort -V > ${IN}.tmp + for PKG in `sed "s/^\(.*\)-\([^-]*\)$/\1/g" ${IN}.tmp | sort -u`; do + grep ${PKG} ${IN}.tmp | tail -n 1 | sed 's/xorg-server/xserver-xorg/g' >> ${OUT}; + done +} + +function updateVersions { + PKG=$1 + GRP=$2 + VER=$3 + BB_VER=`ls -1 ${BBS}${GRP}/${PKG}_*.bb 2>/dev/null | sed "s%${BBS}${GRP}/${PKG}_%%g; s%.bb$%%g" | grep -v X11R7.0 | grep -v cvs | grep -v git | grep -v svn | sort -V | tail -n 1` + #echo ${GRP}/${PKG}/${VER} ${PREF_VER} ${BB_VER} + if ls -1 ${BBS}${GRP}/${PKG}_*.bb >/dev/null 2>/dev/null ; then + echo "PREFERRED_VERSION_${PKG} ?= \"${VER}\"" >> ${PREFS_LIVE} + fi + if [[ -n ${BB_VER} && ${BB_VER} != ${VER} ]] ; then + echo "bump: $GRP ${PKG} ${BB_VER} -> ${VER}" | tee -a ${OUT_LOG} + echo "cp ${BBS}${GRP}/${PKG}_${BB_VER}.bb ${BBS}${GRP}/${PKG}_${VER}.bb" >> ${OUT_CMD} + fi + if [[ -z ${BB_VER} ]] ; then + echo "new ${GRP} ${PKG}/${VER}" | tee -a ${OUT_LOG} + fi +} + +for GRP in ${GRPS}; do + if [[ ! -e ${DIR}/${GRP}.html ]] ; then + wget ${PREFIX}/${GRP} -O ${DIR}/${GRP}.html + fi + latest ${DIR}/${GRP}.html ${DIR}/${GRP}.txt + echo "#${GRP}" >> ${DIR}/latest.txt + sed "s/PKG=/${GRP}\//g; s/-\([^-]*\).tar.bz2$/\/\1/g;" ${DIR}/${GRP}.txt | gawk '{ print tolower($0) }' >> ${DIR}/latest.txt +done + +sort -u ${DIR}/latest.txt > ${DIR}/latest.sort.txt + +echo "#`date`" > ${PREFS_LIVE} + +echo "#`date`" > ${OUT_LOG} +echo "#`date`" > ${OUT_CMD} + +cat ${DIR}/latest.txt | while read LINE; do + if [[ ${LINE} =~ \#.* ]]; then + echo ${LINE} >> ${PREFS_LIVE} + continue + fi + #echo ${LINE}; + PKG=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\2%g;"` + GRP=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\1%g;"` + VER=`echo ${LINE} | sed "s%^\(.*\)\/\(.*\)\/\(.*\)$%\3%g;"` + updateVersions ${PKG} ${GRP} ${VER} + updateVersions ${PKG}-native ${GRP} ${VER} +done + +echo "Check ${OUT_LOG} if there is something new and interesting" +echo "You can update prefs or copy bbfiles with commands from ${OUT_CMD}" |