diff options
Diffstat (limited to 'packages')
75 files changed, 697 insertions, 466 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/zaurus-updater/spitz/.mtn2git_empty b/packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/zaurus-updater/spitz/.mtn2git_empty +++ 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</ |