diff options
Diffstat (limited to 'packages')
56 files changed, 456 insertions, 71 deletions
diff --git a/packages/busybox/busybox-1.2.0/angstrom/defconfig b/packages/busybox/busybox-1.2.0/angstrom/defconfig index 981b7d7c71..e5f48ec64f 100644 --- a/packages/busybox/busybox-1.2.0/angstrom/defconfig +++ b/packages/busybox/busybox-1.2.0/angstrom/defconfig @@ -603,8 +603,8 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set diff --git a/packages/busybox/busybox-1.2.1/angstrom/defconfig b/packages/busybox/busybox-1.2.1/angstrom/defconfig index eb0b8d7c64..1807dab68e 100644 --- a/packages/busybox/busybox-1.2.1/angstrom/defconfig +++ b/packages/busybox/busybox-1.2.1/angstrom/defconfig @@ -603,8 +603,8 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set diff --git a/packages/busybox/busybox-1.2.2/angstrom/defconfig b/packages/busybox/busybox-1.2.2/angstrom/defconfig index eb0b8d7c64..1807dab68e 100644 --- a/packages/busybox/busybox-1.2.2/angstrom/defconfig +++ b/packages/busybox/busybox-1.2.2/angstrom/defconfig @@ -603,8 +603,8 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set diff --git a/packages/busybox/busybox-1.3.1/angstrom/defconfig b/packages/busybox/busybox-1.3.1/angstrom/defconfig index eb0b8d7c64..1807dab68e 100644 --- a/packages/busybox/busybox-1.3.1/angstrom/defconfig +++ b/packages/busybox/busybox-1.3.1/angstrom/defconfig @@ -603,8 +603,8 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set diff --git a/packages/busybox/busybox-1.5.0/angstrom/defconfig b/packages/busybox/busybox-1.5.0/angstrom/defconfig index eb0b8d7c64..1807dab68e 100644 --- a/packages/busybox/busybox-1.5.0/angstrom/defconfig +++ b/packages/busybox/busybox-1.5.0/angstrom/defconfig @@ -603,8 +603,8 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set diff --git a/packages/busybox/busybox-1.6.0/angstrom/defconfig b/packages/busybox/busybox-1.6.0/angstrom/defconfig index eb0b8d7c64..1807dab68e 100644 --- a/packages/busybox/busybox-1.6.0/angstrom/defconfig +++ b/packages/busybox/busybox-1.6.0/angstrom/defconfig @@ -603,8 +603,8 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set diff --git a/packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty b/packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty diff --git a/packages/busybox/busybox-1.7.2/defconfig b/packages/busybox/busybox-1.7.2/angstrom/defconfig index 19cfafab2c..30e71e8ffe 100644 --- a/packages/busybox/busybox-1.7.2/defconfig +++ b/packages/busybox/busybox-1.7.2/angstrom/defconfig @@ -677,8 +677,8 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set diff --git a/packages/busybox/busybox-static-1.2.1/defconfig b/packages/busybox/busybox-static-1.2.1/defconfig index eb0b8d7c64..1807dab68e 100644 --- a/packages/busybox/busybox-static-1.2.1/defconfig +++ b/packages/busybox/busybox-static-1.2.1/defconfig @@ -603,8 +603,8 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set diff --git a/packages/busybox/busybox-static_1.2.1.bb b/packages/busybox/busybox-static_1.2.1.bb index f3bff07530..519468039a 100644 --- a/packages/busybox/busybox-static_1.2.1.bb +++ b/packages/busybox/busybox-static_1.2.1.bb @@ -1,5 +1,5 @@ require busybox_${PV}.bb -PR = "r0" +PR = "r1" S = "${WORKDIR}/busybox-1.2.1" diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index 073a561e22..ca2db7e760 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r37" +PR = "r38" SRC_URI += "file://add-getkey-applet.patch;patch=1 \ file://below.patch;patch=1 \ diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb index 22e7e064a5..39a052bc90 100644 --- a/packages/busybox/busybox_1.01.bb +++ b/packages/busybox/busybox_1.01.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r12" +PR = "r13" SRC_URI += "file://add-getkey-applet.patch;patch=1 \ file://below.patch;patch=1 \ diff --git a/packages/busybox/busybox_1.2.0.bb b/packages/busybox/busybox_1.2.0.bb index db8dd68c01..009d1724ff 100644 --- a/packages/busybox/busybox_1.2.0.bb +++ b/packages/busybox/busybox_1.2.0.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r1" +PR = "r2" SRC_URI += "file://defconfig" diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb index 054649e9df..64a6000747 100644 --- a/packages/busybox/busybox_1.2.1.bb +++ b/packages/busybox/busybox_1.2.1.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r13" +PR = "r14" SRC_URI += "file://wget-long-options.patch;patch=1 \ file://df_rootfs.patch;patch=1 \ diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb index 59aa5f07fc..75847e1117 100644 --- a/packages/busybox/busybox_1.2.2.bb +++ b/packages/busybox/busybox_1.2.2.bb @@ -1,5 +1,7 @@ require busybox.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" SRC_URI = "file://wget-long-options.patch;patch=1 \ diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb index a42a87c50d..369500fc7b 100644 --- a/packages/busybox/busybox_1.3.1.bb +++ b/packages/busybox/busybox_1.3.1.bb @@ -1,5 +1,7 @@ require busybox.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" SRC_URI = "file://defconfig" diff --git a/packages/busybox/busybox_1.5.0.bb b/packages/busybox/busybox_1.5.0.bb index a8678602e7..b8ee4854b8 100644 --- a/packages/busybox/busybox_1.5.0.bb +++ b/packages/busybox/busybox_1.5.0.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/packages/busybox/busybox_1.6.0.bb b/packages/busybox/busybox_1.6.0.bb index a8678602e7..b8ee4854b8 100644 --- a/packages/busybox/busybox_1.6.0.bb +++ b/packages/busybox/busybox_1.6.0.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb index 924176ef5a..98ed135f66 100644 --- a/packages/busybox/busybox_1.7.2.bb +++ b/packages/busybox/busybox_1.7.2.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" diff --git a/packages/cacao/cacao-cldc_0.98.bb b/packages/cacao/cacao-cldc_0.98.bb index f7797206de..0f6af678f5 100644 --- a/packages/cacao/cacao-cldc_0.98.bb +++ b/packages/cacao/cacao-cldc_0.98.bb @@ -10,16 +10,16 @@ SRC_URI +="file://midpath.patch;patch=1 \ SRC_URI_append_arm = "file://offset.h_arm.patch;patch=1" DEPENDS = "cacaoh-cldc-native ecj-native classpath-minimal-native virtual/cldc-api-1.1 libtool zlib" -RDEPENDS = "virtual/cldc-api-1.1" +RDEPENDS = "virtual/cldc-api-1.1 libltdl" RPROVIDES = "virtual/java" -EXTRA_OECONF += "--with-classpath-libdir=${STAGING_LIBDIR}/classpath-minimal \ +EXTRA_OECONF += "--with-classpath-libdir=${STAGING_DATADIR}/classpath-minimal \ --with-classpath-includedir=${STAGING_INCDIR}/classpath-minimal \ --enable-jni \ --enable-java=cldc1.1 \ --with-classpath=cldc1.1 \ - --with-classpath-classes=${STAGING_LIBDIR}/java/cldc1.1.jar \ - --with-target-classpath-classes=${libdir}/java/cldc1.1.jar \ + --with-classpath-classes=${STAGING_DATADIR}/java/cldc1.1.jar \ + --with-target-classpath-classes=${datadir}/java/cldc1.1.jar \ --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh \ --disable-libjvm \ " @@ -28,7 +28,7 @@ PACKAGES = "${PN} ${PN}-doc ${PN}-dbg" FILES_${PN} = "${bindir}/cacao" FILES_${PN}-doc = "${datadir}/man" -FILES_${PN}-dbg = "${bindir}/.debug ${libdir}/.debug/lib*.so*" +FILES_${PN}-dbg = "${bindir}/.debug" ALTERNATIVE_NAME = "java" ALTERNATIVE_PATH = "${bindir}/cacao" diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc index 1f783b8238..9315babfb9 100644 --- a/packages/cacao/cacao.inc +++ b/packages/cacao/cacao.inc @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.cacaojvm.org/" LICENSE = "GPL" PRIORITY = "optional" SECTION = "interpreters" +PR = "r1" inherit autotools diff --git a/packages/cacao/cacaoh-cldc-native_0.98.bb b/packages/cacao/cacaoh-cldc-native_0.98.bb index ebadf3e023..7ea7cad5dd 100644 --- a/packages/cacao/cacaoh-cldc-native_0.98.bb +++ b/packages/cacao/cacaoh-cldc-native_0.98.bb @@ -9,7 +9,7 @@ EXTRA_OECONF += "--with-classpath-includedir=${STAGING_INCDIR}/classpath-minimal --enable-jni \ --enable-java=cldc1.1 \ --with-classpath=cldc1.1 \ - --with-classpath-classes=${STAGING_LIBDIR}/java/cldc1.1.jar \ + --with-classpath-classes=${STAGING_DATADIR}/java/cldc1.1.jar \ " do_stage() { install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/ diff --git a/packages/dropbear/dropbear/init b/packages/dropbear/dropbear/init index d019bdb4ba..5c8dfc12a8 100755 --- a/packages/dropbear/dropbear/init +++ b/packages/dropbear/dropbear/init @@ -50,10 +50,16 @@ gen_keys() { for t in $DROPBEAR_KEYTYPES; do case $t in rsa) - test -f $DROPBEAR_RSAKEY || dropbearkey -t rsa -f $DROPBEAR_RSAKEY + if [ ! -f $DROPBEAR_RSAKEY ]; then + echo "Creating $DESC RSA host key." + dropbearkey -t rsa -f $DROPBEAR_RSAKEY + fi ;; dsa) - test -f $DROPBEAR_DSSKEY || dropbearkey -t dss -f $DROPBEAR_DSSKEY + if [ ! -f $DROPBEAR_DSSKEY ]; then + echo "Creating $DESC DSA host key." + dropbearkey -t dss -f $DROPBEAR_DSSKEY + fi ;; esac done @@ -61,8 +67,8 @@ done case "$1" in start) - echo -n "Starting $DESC: " gen_keys + echo -n "Starting $DESC: " KEY_ARGS="" test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY" test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY" diff --git a/packages/dropbear/dropbear_0.49.bb b/packages/dropbear/dropbear_0.49.bb index f98c0ac8f6..0ed386ca0c 100644 --- a/packages/dropbear/dropbear_0.49.bb +++ b/packages/dropbear/dropbear_0.49.bb @@ -1 +1,3 @@ +PR = "r1" + require dropbear.inc diff --git a/packages/gettext/gettext-0.14.1/disable_java.patch b/packages/gettext/gettext-0.14.1/disable_java.patch new file mode 100644 index 0000000000..0c641eb91b --- /dev/null +++ b/packages/gettext/gettext-0.14.1/disable_java.patch @@ -0,0 +1,33 @@ +Index: gettext-0.14.1/gettext-tools/configure.ac +=================================================================== +--- gettext-0.14.1.orig/gettext-tools/configure.ac 2004-01-16 10:49:06.000000000 +0000 ++++ gettext-0.14.1/gettext-tools/configure.ac 2007-11-14 21:43:39.000000000 +0000 +@@ -37,28 +37,16 @@ + AC_PROG_YACC + + gt_GCJ +-if test -n "$HAVE_GCJ"; then +- BUILDJAVAEXE=yes +-else + BUILDJAVAEXE=no +-fi + AC_SUBST(BUILDJAVAEXE) + + gt_JAVACOMP + AC_CHECK_PROG(JAR, jar, jar) +-if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then +- BUILDJAVA=yes +-else + BUILDJAVA=no +-fi + AC_SUBST(BUILDJAVA) + + gt_JAVAEXEC +-if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then +- TESTJAVA=yes +-else + TESTJAVA=no +-fi + AC_SUBST(TESTJAVA) + + gt_CSHARPCOMP diff --git a/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb index 4e25c0e829..960db30b56 100644 --- a/packages/gettext/gettext_0.14.1.bb +++ b/packages/gettext/gettext_0.14.1.bb @@ -2,13 +2,14 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPL" -PR = "r5" +PR = "r6" PROVIDES = "virtual/libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://gettext-vpath.patch;patch=1;pnum=1 \ file://fixchicken.patch;patch=1;pnum=1 \ - file://getline.m4.patch;patch=1" + file://getline.m4.patch;patch=1 \ + file://disable_java.patch;patch=1" SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1" diff --git a/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty b/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty diff --git a/packages/hostap/hostap-daemon-0.6.0/init b/packages/hostap/hostap-daemon-0.6.0/init new file mode 100644 index 0000000000..79f74b681e --- /dev/null +++ b/packages/hostap/hostap-daemon-0.6.0/init @@ -0,0 +1,37 @@ +#!/bin/sh +DAEMON=/usr/sbin/hostapd +NAME=hostapd +DESC="HOSTAP Daemon" +ARGS="/etc/hostapd.conf -B" + +test -f $DAEMON || exit 0 + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon -S -x $DAEMON -- $ARGS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon -K -x $DAEMON + echo "$NAME." + ;; + restart) + $0 stop + $0 start + ;; + reload) + echo -n "Reloading $DESC: " + killall -HUP $(basename ${DAEMON}) + echo "$NAME." + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff b/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff new file mode 100644 index 0000000000..9534199e78 --- /dev/null +++ b/packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff @@ -0,0 +1,25 @@ +diff -urN hostapd.orig/Makefile hostapd/Makefile +--- hostapd.orig/Makefile 2007-05-28 19:26:55.000000000 +0200 ++++ hostapd/Makefile 2007-11-22 16:28:44.000000000 +0100 +@@ -6,6 +6,8 @@ + CFLAGS = -MMD -O2 -Wall -g + endif + ++TARGET_PREFIX ?= /usr/local/bin/ ++ + # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to + # a file (undefine it, if you want to save in binary size) + CFLAGS += -DHOSTAPD_DUMP_STATE +@@ -361,10 +363,10 @@ + fi + + install: all +- for i in $(ALL); do cp $$i /usr/local/bin/$$i; done ++ for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done + + hostapd: $(OBJS) +- $(CC) -o hostapd $(OBJS) $(LIBS) ++ $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) + + OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o + hostapd_cli: $(OBJS_c) diff --git a/packages/hostap/hostap-daemon_0.6.0.bb b/packages/hostap/hostap-daemon_0.6.0.bb new file mode 100644 index 0000000000..37b710db19 --- /dev/null +++ b/packages/hostap/hostap-daemon_0.6.0.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "User space daemon for extended IEEE 802.11 management" +HOMEPAGE = "http://hostap.epitest.fi" +SECTION = "kernel/userland" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ + file://makefile-cross.diff;patch=1 \ + file://defconfig \ + file://init" + +S = "${WORKDIR}/hostapd-${PV}/hostapd" + +export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" + +inherit update-rc.d +INITSCRIPT_NAME=hostapd + +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + if [ "x$HAS_PCI" == "x1" ] ; then + echo "CONFIG_DRIVER_MADWIFI=y" >> .config + echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config + fi +} + +do_compile() { + CFLAGS='${CFLAGS}' CC='${CC}' make +} + +do_install() { + install -d ${D}${sbindir} ${D}${sysconfdir}/init.d + make TARGET_PREFIX=${D}${sbindir} install + install -m 0644 hostapd.conf ${D}${sysconfdir} + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd +} + diff --git a/packages/initrdscripts/files/10-initfs.sh b/packages/initrdscripts/files/10-initfs.sh new file mode 100644 index 0000000000..bad649e5c2 --- /dev/null +++ b/packages/initrdscripts/files/10-initfs.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +modprobe -q vfat >/dev/null 2>&1 +modprobe -q ext2 >/dev/null 2>&1 +modprobe -q ext3 >/dev/null 2>&1 diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh new file mode 100644 index 0000000000..5b3e7782f4 --- /dev/null +++ b/packages/initrdscripts/files/30-bootmenu.sh @@ -0,0 +1,154 @@ +# If root is explicitly specified, skip interactive selection +if [ -z "$ROOT_DEVICE" ]; then +############################## + +E="\033[" +MOUNTLOC="tmp" +LOOP_IMG_MASK='*.img' + +if ! (echo " " | read -n1 foo) >/dev/null 2>&1; then + echo "'read' command lacks -n switch support, aborting" + exit 1 +fi + +mkdir -p $MOUNTLOC + +list="" + +add_menu_item() +{ + if [ -n "$list" ]; then + list="$list\n" + fi + + list="$list$1" +} + +show_menu() { + echo -e -n "${E}3;0H" + cnt=0 + echo -e $list | \ + while read l; do + if [ $cnt == $num ]; then + echo -e -n "${E}1m" + fi + echo -e "$cnt: $l${E}0m" + cnt=$((cnt + 1)) + done +} + +get_menu_selection() +{ + cnt=0 + sel=`echo -e $list | \ + while read l; do + if [ $cnt == $num ]; then + echo $l + break + fi + cnt=$((cnt + 1)) + done` +} + +get_partition_type() +{ + fstype=`mount -f --guess-fstype /dev/$dev $MOUNTLOC` +} + +scan_for_loopimgs() +{ +# Scan a device for loopback images, add to the list if found + mount /dev/$dev $MOUNTLOC + p=$PWD + cd $MOUNTLOC + for img in `ls -1 $LOOP_IMG_MASK 2>/dev/null`; do + add_menu_item "$dev/$img (loop img on vfat)" + done + cd $p + umount $MOUNTLOC +} + +# Scan all available device/partitions +while read maj min nblk dev; do + if [ -z "$maj" -o "$maj" == "major" ]; then + continue; + fi + + get_partition_type + if [ "$fstype" != "ext2" -a "$fstype" != "ext3" -a "$fstype" != "vfat" ]; then +# continue + true + fi + + if [ "$fstype" == "vfat" ]; then + scan_for_loopimgs + continue + fi + + add_menu_item "$dev ($fstype)" +done < /proc/partitions + +add_menu_item "NFS (nfsroot=192.168.2.200:/nfs/image)" + +total=`echo -e $list | wc -l` +num=0 + +# Draw UI +stty -echo +echo -e -n "${E}2J" +echo -e -n "${E}0;0H" +echo "Select boot image:" + +# Main loop +show_menu +while read -n1 i; do + case "$i" in + "A") + num=$((num - 1)) + if [ $num -lt 0 ]; then + num=$(($total - 1)) + fi + ;; + ["B"-"Z"]) + num=$((num + 1)) + if [ $num -ge $total ]; then + num=0 + fi + ;; + "q") + exec sh + ;; + "") + break + ;; + esac + show_menu +# echo "*$esc$i" +done + +stty echo + +# Process results of user selection, prepare input arguments +# for boot modules + +get_menu_selection +echo Selected: $sel + +dev=`expr "$sel" : '\([^ /]*\)'` +path=`expr "$sel" : '[^/]*\([^ ]*\).*'` + +if [ "$dev" == "NFS" ]; then + ROOT_DEVICE="/dev/nfs" + CMDLINE="$CMDLINE nfsroot=192.168.2.200:/nfs/image" +elif [ -n "$path" ]; then + ROOT_DEVICE="/dev/loop" + CMDLINE="looproot=/dev/$dev:$path" +else + ROOT_DEVICE="/dev/$dev" +fi + +echo ROOT_DEVICE=$ROOT_DEVICE +echo CMDLINE=$CMDLINE + +############################## +fi diff --git a/packages/initrdscripts/files/loopboot.sh b/packages/initrdscripts/files/80-loopboot.sh index 55a1948db8..d84244428e 100644 --- a/packages/initrdscripts/files/loopboot.sh +++ b/packages/initrdscripts/files/80-loopboot.sh @@ -21,11 +21,10 @@ if [ "$ROOT_DEVICE" = "/dev/loop" ]; then echo "Mounting $dev on $hostpt" mkdir $hostpt mount $dev $hostpt - cd $hostpt fi echo "Loopback setup of $path (offset $offset)" - losetup -o "$offset" "$loopdev" "$path" + losetup -o "$offset" "$loopdev" "$hostpt/$path" echo "Mounting $loopdev on $mountpt" mkdir "$mountpt" @@ -35,7 +34,6 @@ if [ "$ROOT_DEVICE" = "/dev/loop" ]; then loop_num=`expr "$loop_num" + 1` } - modprobe vfat modprobe loop loop_num=0 diff --git a/packages/initrdscripts/files/nfsboot.sh b/packages/initrdscripts/files/80-nfsboot.sh index 5129a53ebb..5129a53ebb 100644 --- a/packages/initrdscripts/files/nfsboot.sh +++ b/packages/initrdscripts/files/80-nfsboot.sh diff --git a/packages/initrdscripts/files/blockboot.sh b/packages/initrdscripts/files/85-blockboot.sh index 567f7e29b3..567f7e29b3 100644 --- a/packages/initrdscripts/files/blockboot.sh +++ b/packages/initrdscripts/files/85-blockboot.sh diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index 8c9803f21b..f8d5de9173 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -2,14 +2,17 @@ MODULE_DIR=/initrd.d BOOT_ROOT= -ROOT_DEVICE=/dev/null +ROOT_DEVICE= early_setup() { mkdir /proc mount -t proc proc /proc mkdir /mnt +} - echo -n "creating device nodes: " +dev_setup() +{ + echo -n "initramfs: Creating device nodes: " grep '^ *[0-9]' /proc/partitions | while read major minor blocks dev do if [ ! -e /dev/$dev ]; then @@ -35,6 +38,7 @@ read_args() { load_modules() { for module in $MODULE_DIR/*; do + echo "initramfs: Loading $module module" source $module done } @@ -60,6 +64,8 @@ if [ -n "$rootdelay" ]; then sleep $rootdelay fi +dev_setup + load_modules [ -n "$BOOT_ROOT" ] && boot_root boot_failed diff --git a/packages/initrdscripts/initramfs-module-block_0.1.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb index a0cb2fd7fa..73f7a709f1 100644 --- a/packages/initrdscripts/initramfs-module-block_0.1.bb +++ b/packages/initrdscripts/initramfs-module-block_1.0.bb @@ -1,11 +1,11 @@ -SRC_URI = "file://blockboot.sh" -PR = "r2" +SRC_URI = "file://85-blockboot.sh" +PR = "r0" RDEPENDS = "initramfs-uniboot" DESCRIPTION = "An initramfs module for booting off normal block devices." do_install() { install -d ${D}/initrd.d - install -m 0755 ${WORKDIR}/blockboot.sh ${D}/initrd.d/block + install -m 0755 ${WORKDIR}/85-blockboot.sh ${D}/initrd.d/ } -FILES_${PN} += " /initrd.d/block " +FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb new file mode 100644 index 0000000000..3fc8647f6c --- /dev/null +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -0,0 +1,11 @@ +SRC_URI = "file://30-bootmenu.sh" +PR = "r1" +RDEPENDS = "util-linux-mount initramfs-uniboot initramfs-module-block initramfs-module-loop" +DESCRIPTION = "An initramfs module with UI for selection of boot device." + +do_install() { + install -d ${D}/initrd.d + install -m 0755 ${WORKDIR}/30-bootmenu.sh ${D}/initrd.d/ +} + +FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-initfs_1.0.bb b/packages/initrdscripts/initramfs-module-initfs_1.0.bb new file mode 100644 index 0000000000..48ae6c2160 --- /dev/null +++ b/packages/initrdscripts/initramfs-module-initfs_1.0.bb @@ -0,0 +1,12 @@ +SRC_URI = "file://10-initfs.sh" +PR = "r1" +DESCRIPTION = "An initramfs module for initializing filesystems." +RDEPENDS = "initramfs-uniboot" +RRECOMMENDS = "kernel-module-vfat kernel-module-ext2" + +do_install() { + install -d ${D}/initrd.d + install -m 0755 ${WORKDIR}/10-initfs.sh ${D}/initrd.d/ +} + +FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-loop_0.1.bb b/packages/initrdscripts/initramfs-module-loop_1.0.bb index d4e5aa038f..5cc84bcaf8 100644 --- a/packages/initrdscripts/initramfs-module-loop_0.1.bb +++ b/packages/initrdscripts/initramfs-module-loop_1.0.bb @@ -1,13 +1,13 @@ -SRC_URI = "file://loopboot.sh" -PR = "r3" +SRC_URI = "file://80-loopboot.sh" +PR = "r1" DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \ mounting it." -RDEPENDS = "initramfs-uniboot" +RDEPENDS = "initramfs-uniboot initramfs-module-initfs" RRECOMMENDS = "kernel-module-loop kernel-module-vfat" do_install() { install -d ${D}/initrd.d - install -m 0755 ${WORKDIR}/loopboot.sh ${D}/initrd.d/loop + install -m 0755 ${WORKDIR}/80-loopboot.sh ${D}/initrd.d/ } -FILES_${PN} += " /initrd.d/loop " +FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-nfs_0.1.bb b/packages/initrdscripts/initramfs-module-nfs_1.0.bb index 24284d6c5f..6555688fce 100644 --- a/packages/initrdscripts/initramfs-module-nfs_0.1.bb +++ b/packages/initrdscripts/initramfs-module-nfs_1.0.bb @@ -1,12 +1,12 @@ -SRC_URI = "file://nfsboot.sh" -PR = "r4" +SRC_URI = "file://80-nfsboot.sh" +PR = "r0" DESCRIPTION = "An initramfs module for booting via NFS." RDEPENDS = "initramfs-uniboot" RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs" do_install() { install -d ${D}/initrd.d - install -m 0755 ${WORKDIR}/nfsboot.sh ${D}/initrd.d/nfs + install -m 0755 ${WORKDIR}/80-nfsboot.sh ${D}/initrd.d/ } FILES_${PN} += " /initrd.d/nfs " diff --git a/packages/initrdscripts/initramfs-uniboot_0.2.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb index 46ba06ff9a..f8d9d76936 100644 --- a/packages/initrdscripts/initramfs-uniboot_0.2.bb +++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://init.sh" -PR = "r1" +PR = "r0" DESCRIPTON = "A modular initramfs init script system." RDEPENDS = "busybox-static" RRECOMMENDS = "kernel-module-uinput" diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc index 754f3b95bf..0f81bd4221 100644 --- a/packages/linux/linux-rp.inc +++ b/packages/linux/linux-rp.inc @@ -4,6 +4,7 @@ LICENSE = "GPL" inherit kernel +DEPENDS_collie += "bc-native" RPROVIDES_kernel-base += "hostap-modules" DOSRC = "http://www.do13.de/openzaurus/patches" diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb index 795e727ed3..2084930192 100644 --- a/packages/linux/linux-rp_2.6.21.bb +++ b/packages/linux/linux-rp_2.6.21.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r10" +PR = "r11" DEFAULT_PREFERENCE_collie = "1" diff --git a/packages/midpath/midpath-alsa_0.1.bb b/packages/midpath/midpath-alsa_0.1.bb index 940a1ea8a2..6d580405b6 100644 --- a/packages/midpath/midpath-alsa_0.1.bb +++ b/packages/midpath/midpath-alsa_0.1.bb @@ -13,10 +13,6 @@ do_configure() { do_compile() { -mkdir -p ${S}/dist - -# Build native code - # Build the ALSA native part cd ${S}/native/alsa make || exit 1 diff --git a/packages/midpath/midpath-cldc-sdl_0.1.bb b/packages/midpath/midpath-cldc-sdl_0.1.bb index d00cbfc619..65850e2f4c 100644 --- a/packages/midpath/midpath-cldc-sdl_0.1.bb +++ b/packages/midpath/midpath-cldc-sdl_0.1.bb @@ -13,8 +13,6 @@ do_configure() { do_compile() { -mkdir -p ${S}/dist - # Build SDLJava for CLDC cd ${S}/external/sdljava-cldc make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH} -sourcepath ${S}/external/sdljava-cldc -source 1.3 -target 1.1" || exit 1 diff --git a/packages/midpath/midpath-cldc-x11_0.1.bb b/packages/midpath/midpath-cldc-x11_0.1.bb index 30ca378436..9db0c4a686 100644 --- a/packages/midpath/midpath-cldc-x11_0.1.bb +++ b/packages/midpath/midpath-cldc-x11_0.1.bb @@ -12,8 +12,6 @@ do_configure() { do_compile() { -mkdir -p ${S}/dist - # Build Escher X11 library cd ${S}/external/escher-cldc/core make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/escher-cldc/core -source 1.3 -target 1.1" || exit 1 diff --git a/packages/midpath/midpath-cldc_0.1.bb b/packages/midpath/midpath-cldc_0.1.bb index 24ffc61332..51a1314467 100644 --- a/packages/midpath/midpath-cldc_0.1.bb +++ b/packages/midpath/midpath-cldc_0.1.bb @@ -2,6 +2,7 @@ require midpath.inc PROVIDES = "virtual/cldc-api-1.1" +RPROVIDES = "virtual/cldc-api-1.1" do_compile() { diff --git a/packages/midpath/midpath-gtk_0.1.bb b/packages/midpath/midpath-gtk_0.1.bb index 680b4e259d..7bf5570ef2 100644 --- a/packages/midpath/midpath-gtk_0.1.bb +++ b/packages/midpath/midpath-gtk_0.1.bb @@ -15,8 +15,6 @@ do_configure() { do_compile() { -mkdir -p ${S}/dist - # Build the GTK native part cd ${S}/native/gtk make || exit 1 diff --git a/packages/midpath/midpath-pulseaudio_0.1.bb b/packages/midpath/midpath-pulseaudio_0.1.bb new file mode 100644 index 0000000000..6344e018a0 --- /dev/null +++ b/packages/midpath/midpath-pulseaudio_0.1.bb @@ -0,0 +1,39 @@ + +require midpath_${PV}.bb + +DEPENDS = "pulseaudio" +RDEPENDS = "pulseaudio" + +do_configure() { + cd ${S}/native/pulseaudio + sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile + cd ${S}/resources-embedded/com/sun/midp/configuration + sed -i -e "s|sound.backend:NULL|sound.backend:PulseAudio|" configuration.cfg +} + +do_compile() { + +# Build the PulseAudio native part +cd ${S}/native/pulseaudio +make || exit 1 + +} + +do_install() { + install -d ${D}${libdir} + install -m 0644 ${S}/native/pulseaudio/libmidpathpulse.so ${D}${libdir} + install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration + install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/ +} + +do_stage() { + : +} + +PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/libmidpathpulse.so \ + ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \ + " + +CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg" diff --git a/packages/midpath/midpath-qt3x11_0.1.bb b/packages/midpath/midpath-qt3x11_0.1.bb index 1d44706db9..1d24012810 100644 --- a/packages/midpath/midpath-qt3x11_0.1.bb +++ b/packages/midpath/midpath-qt3x11_0.1.bb @@ -20,8 +20,6 @@ do_configure() { do_compile() { -mkdir -p ${S}/dist - # Build the QT native part cd ${S}/native/qt make || exit 1 diff --git a/packages/midpath/midpath-qte_0.1.bb b/packages/midpath/midpath-qte_0.1.bb index e37825bf57..39b9264930 100644 --- a/packages/midpath/midpath-qte_0.1.bb +++ b/packages/midpath/midpath-qte_0.1.bb @@ -18,8 +18,6 @@ do_configure() { do_compile() { -mkdir -p ${S}/dist - # Build the QT native part cd ${S}/native/qt make || exit 1 diff --git a/packages/midpath/midpath.inc b/packages/midpath/midpath.inc index 7f6e4f3d31..33793bffd0 100644 --- a/packages/midpath/midpath.inc +++ b/packages/midpath/midpath.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://midpath.thenesis.org/" LICENSE = "GPL" PRIORITY = "optional" SECTION = "interpreters" -PR = "r0" +PR = "r1" SRC_URI = "http://downloads.sourceforge.net/midpath/midpath-${PV}.tar.gz" diff --git a/packages/mpfr/mpfr-native_2.3.0.bb b/packages/mpfr/mpfr-native_2.3.0.bb new file mode 100644 index 0000000000..01ba37c8bf --- /dev/null +++ b/packages/mpfr/mpfr-native_2.3.0.bb @@ -0,0 +1,4 @@ +require mpfr_${PV}.bb +inherit native +DEPENDS = "gmp-native" + diff --git a/packages/mpfr/mpfr_2.3.0.bb b/packages/mpfr/mpfr_2.3.0.bb new file mode 100644 index 0000000000..2acd7da3e4 --- /dev/null +++ b/packages/mpfr/mpfr_2.3.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding" +LICENSE = "LGPL" +SECTION = "libs" +DEPENDS = "gmp" +PR = "r0" + +SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2" +S = "${WORKDIR}/mpfr-${PV}" + +inherit autotools + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + infodir=${STAGING_DIR}/${HOST_SYS}/info +} diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index f03e822db8..e7b00e3316 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r69" +PR = "r70" inherit task @@ -139,7 +139,7 @@ RDEPENDS_task-openmoko-pim = "\ openmoko-appmanager2 \ openmoko-tasks2 \ openmoko-mediaplayer2 \ -# openmoko-messages \ + openmoko-messages2 \ " # |