diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-11-26 14:45:14 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-11-26 14:45:14 +0000 |
| commit | dc55bdcac1f124990a9837f39374c753ffd86dec (patch) | |
| tree | 0b9d26957bf2c51dcff6b8eea2a06adf734681aa | |
| parent | 0bd5a64203d0d45c4afb7f8723a553a3a830921f (diff) | |
| parent | 256626d3db13a6f076f69db9ef1ab34ef1acf066 (diff) | |
merge of '8744f51b03fb8cbe26fbea1e61c9ca8c0cda7571'
and '9722830207e34266d2aae4fe5fba289f2f7cb711'
78 files changed, 472 insertions, 193 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0b039beeea..53c4380116 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -94,7 +94,7 @@ Person: Junqian Gordon Xu 'xjqian' Mail: xjqian@gmail.com Machines: tosa, borzoi, nokia770 Distros: Ångström -Recipes: gnuplot +Recipes: gnuplot octave Person: Justin Patrin Mail: papercrane@reversefold.com diff --git a/classes/insane.bbclass b/classes/insane.bbclass index bc72ea5b3b..473fe6ebbf 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -57,8 +57,12 @@ def package_qa_get_machine_dict(): "arm" : ( 40, 97, 0, True, True), "armeb": ( 40, 97, 0, False, True), "powerpc": ( 20, 0, 0, False, True), + "i386": ( 3, 0, 0, True, True), + "i486": ( 3, 0, 0, True, True), + "i586": ( 3, 0, 0, True, True), + "i686": ( 3, 0, 0, True, True), "mipsel": ( 8, 0, 0, True, True), - "avr32": (6317, 0, 0, False, True), + "avr32": (6317, 0, 0, False, True), }, "uclinux-uclibc" : { "bfin": ( 106, 0, 0, True, True), diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index bd14df5814..09517fd11d 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -16,6 +16,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" +XSERVER = "xserver-kdrive-fbdev" # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index cbd859d1e9..4cad7924f1 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -16,6 +16,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "285" +XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev" # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ diff --git a/packages/binutils/binutils-2.17.50.0.5/binutils-configure-texinfo-version.patch b/packages/binutils/binutils-2.17.50.0.5/binutils-configure-texinfo-version.patch new file mode 100644 index 0000000000..9cc18412fd --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.5/binutils-configure-texinfo-version.patch @@ -0,0 +1,22 @@ +--- binutils-2.18/configure.orig 2007-10-11 21:09:27.000000000 -0700 ++++ binutils-2.18/configure 2007-10-11 21:10:20.000000000 -0700 +@@ -6128,7 +6128,7 @@ case " $build_configdirs " in + # For an installed makeinfo, we require it to be from texinfo 4.4 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" +--- binutils-2.18/configure.in.orig 2007-10-11 21:10:54.000000000 -0700 ++++ binutils-2.18/configure.in 2007-10-11 21:11:13.000000000 -0700 +@@ -2403,7 +2403,7 @@ changequote(,) + # For an installed makeinfo, we require it to be from texinfo 4.4 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-configure-texinfo-version.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-configure-texinfo-version.patch new file mode 100644 index 0000000000..9cc18412fd --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/binutils-configure-texinfo-version.patch @@ -0,0 +1,22 @@ +--- binutils-2.18/configure.orig 2007-10-11 21:09:27.000000000 -0700 ++++ binutils-2.18/configure 2007-10-11 21:10:20.000000000 -0700 +@@ -6128,7 +6128,7 @@ case " $build_configdirs " in + # For an installed makeinfo, we require it to be from texinfo 4.4 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" +--- binutils-2.18/configure.in.orig 2007-10-11 21:10:54.000000000 -0700 ++++ binutils-2.18/configure.in 2007-10-11 21:11:13.000000000 -0700 +@@ -2403,7 +2403,7 @@ changequote(,) + # For an installed makeinfo, we require it to be from texinfo 4.4 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" diff --git a/packages/binutils/binutils-cross.inc b/packages/binutils/binutils-cross.inc index fb966d3c7b..642d5318e7 100644 --- a/packages/binutils/binutils-cross.inc +++ b/packages/binutils/binutils-cross.inc @@ -6,7 +6,7 @@ PACKAGES = "" EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \ --program-prefix=${TARGET_PREFIX} \ --enable-install-libbfd \ - " + --disable-werror" do_stage () { oe_runmake install diff --git a/packages/binutils/binutils_2.17.50.0.5.bb b/packages/binutils/binutils_2.17.50.0.5.bb index dc73dc6909..fa601c18a7 100644 --- a/packages/binutils/binutils_2.17.50.0.5.bb +++ b/packages/binutils/binutils_2.17.50.0.5.bb @@ -6,6 +6,7 @@ SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ + file://binutils-configure-texinfo-version.patch;patch=1 \ file://110-arm-eabi-conf.patch;patch=1 \ file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \ diff --git a/packages/binutils/binutils_2.17.50.0.8.bb b/packages/binutils/binutils_2.17.50.0.8.bb index f832d97cd1..a60c7524d7 100644 --- a/packages/binutils/binutils_2.17.50.0.8.bb +++ b/packages/binutils/binutils_2.17.50.0.8.bb @@ -5,6 +5,7 @@ SRC_URI = \ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ + file://binutils-configure-texinfo-version.patch;patch=1 \ file://110-arm-eabi-conf.patch;patch=1 \ file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \ 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.1/slugos/defconfig b/packages/busybox/busybox-1.2.1/slugos/defconfig index c76954e711..74ece9c3b6 100644 --- a/packages/busybox/busybox-1.2.1/slugos/defconfig +++ b/packages/busybox/busybox-1.2.1/slugos/defconfig @@ -171,7 +171,7 @@ CONFIG_MKNOD=y CONFIG_MV=y # CONFIG_FEATURE_MV_LONG_OPTIONS is not set # CONFIG_NICE is not set -# CONFIG_NOHUP is not set +CONFIG_NOHUP=y CONFIG_OD=y # CONFIG_PRINTENV is not set CONFIG_PRINTF=y @@ -595,8 +595,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_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..325111c22f 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 = "r15" 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/fftw/fftw.inc b/packages/fftw/fftw.inc index 88c946b1d4..acd1b27f4b 100644 --- a/packages/fftw/fftw.inc +++ b/packages/fftw/fftw.inc @@ -2,6 +2,7 @@ DESCRIPTION = "FFTW" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" +RPROVIDES += "libfftw3" PR = "r1" diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb index 337562b207..f7a00d8afc 100644 --- a/packages/gcc/gcc-cross_4.1.2.bb +++ b/packages/gcc/gcc-cross_4.1.2.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .bb changes something that affects its *build* # remember to increment this one too. -PR = "r11" +PR = "r12" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index 0875d1ab86..5c6b370d82 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -78,4 +78,9 @@ do_install () { ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.* ${TARGET_PREFIX}strip ${D}${target_libdir}/libgfortran*.so* || true fi + + # Link gfortran to g77 to satisfy not-so-smart configure or hard coded g77 + # gfortran is fully backwards compatible. This is a safe and practical solution. + ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}gfortran ${CROSS_DIR}/bin/${TARGET_PREFIX}g77 || true + ln -sf ${CROSS_DIR}/${TARGET_SYS}/bin/gfortran ${CROSS_DIR}/${TARGET_SYS}/bin/g77 || true } diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc index 82bf78db80..96f1604997 100644 --- a/packages/gcc/gcc-package.inc +++ b/packages/gcc/gcc-package.inc @@ -5,6 +5,7 @@ PACKAGES = "libgcc ${PN} ${PN}-symlinks \ g++ g++-symlinks \ cpp cpp-symlinks \ g77 g77-symlinks \ + gfortran gfortran-symlinks \ gcov gcov-symlinks \ libmudflap libmudflap-dev \ libstdc++ libg2c \ @@ -28,6 +29,11 @@ FILES_g77 = "${bindir}/${TARGET_PREFIX}g77 \ FILES_g77-symlinks = "${bindir}/g77 \ ${bindir}/f77" +FILES_gfortran = "${bindir}/${TARGET_PREFIX}gfortran \ + ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f951" +FILES_gfortran-symlinks = "${bindir}/gfortran \ + ${bindir}/f95" + FILES_cpp = "${bindir}/${TARGET_PREFIX}cpp \ ${base_libdir}/cpp" FILES_cpp-symlinks = "${bindir}/cpp" @@ -114,10 +120,12 @@ do_install () { rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-* # Symlinks so we can use these trivially on the target - ln -sf ${TARGET_SYS}-g77 g77 + ln -sf ${TARGET_SYS}-g77 g77 || true + ln -sf ${TARGET_SYS}-gfortran gfortran || true ln -sf ${TARGET_SYS}-g++ g++ ln -sf ${TARGET_SYS}-gcc gcc - ln -sf g77 f77 + ln -sf g77 f77 || true + ln -sf gfortran f95 || true ln -sf g++ c++ ln -sf gcc cc ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc index 2924f0f9dd..bb48f7b099 100644 --- a/packages/gcc/gcc3-build.inc +++ b/packages/gcc/gcc3-build.inc @@ -16,7 +16,7 @@ JAVA_arm ?= "" JAVA_armeb ?= "" JAVA_mipsel ?= "" JAVA_sh3 ?= "" -# gcc4-build sets this to f95 +# gcc4-build sets this to fortran FORTRAN ?= ",f77" LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb index 3a4eaf9d3b..bdf9eb3b69 100644 --- a/packages/gcc/gcc_4.1.0.bb +++ b/packages/gcc/gcc_4.1.0.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -13,7 +13,8 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ file://zecke-xgcc-cpp.patch;patch=1 \ - file://ldflags.patch;patch=1" + file://ldflags.patch;patch=1 \ + file://pr34130.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index 499075e0e9..d7d489ec9f 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r15" +PR = "r16" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -34,6 +34,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://gcc-4.1.1-pr13685-1.patch;patch=1 \ file://gcc-ignore-cache.patch;patch=1 \ file://gcc-4.1.1-e300cx.patch;patch=1 \ + file://pr34130.patch;patch=1 \ " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb index a6c99140b5..92db116555 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -4,7 +4,7 @@ SECTION = "devel" LICENSE = "GPL" # NOTE: split PR. If the main .bb changes something that affects its *build* # remember to increment the -cross .bb PR too. -PR = "r8" +PR = "r9" inherit autotools gettext diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb index 7bf074de57..2e1f20ae5f 100644 --- a/packages/gcc/gcc_4.2.1.bb +++ b/packages/gcc/gcc_4.2.1.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -39,6 +39,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran.patch;patch=1 \ + file://pr34130.patch;patch=1 \ " SRC_URI_append_ep93xx = " \ diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb index f13f218ab5..ccf945ac5b 100644 --- a/packages/gcc/gcc_4.2.2.bb +++ b/packages/gcc/gcc_4.2.2.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -39,6 +39,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran.patch;patch=1 \ + file://pr34130.patch;patch=1 \ " SRC_URI_append_ep93xx = " \ diff --git a/packages/gsl/gsl_1.4.bb b/packages/gsl/gsl_1.10.bb index 5e6ea090e4..bd941bc7ae 100644 --- a/packages/gsl/gsl_1.4.bb +++ b/packages/gsl/gsl_1.10.bb @@ -1,7 +1,9 @@ DESCRIPTION = "GNU Scientific Library" +HOMEPAGE = "http://www.gnu.org/software/gsl/" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" +PR = "r0" SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" diff --git a/packages/libdaemon/libdaemon_0.12.bb b/packages/libdaemon/libdaemon_0.12.bb new file mode 100644 index 0000000000..c91f6351ff --- /dev/null +++ b/packages/libdaemon/libdaemon_0.12.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons." +SECTION = "libs" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" +HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-lynx --disable-doxygen" + +do_stage () { + oe_libinstall -a -so -C libdaemon libdaemon ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/libdaemon + for i in daemon.h dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do + install -m 0644 ${S}/libdaemon/$i ${STAGING_INCDIR}/libdaemon/ + done +} diff --git a/packages/liboil/liboil_0.3.11.bb b/packages/liboil/liboil_0.3.11.bb index 352377ed6b..4ff86f44b5 100644 --- a/packages/liboil/liboil_0.3.11.bb +++ b/packages/liboil/liboil_0.3.11.bb @@ -1,7 +1,9 @@ DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs." HOMEPAGE = "http://liboil.freedesktop.org/" LICENSE = "various" -PR="r1" +PR="r2" + +DEPENDS = "glib-2.0" SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \ file://ppc-detect-fpu.patch;patch=1" diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig index 921ab991c9..42527b3dfc 100644 --- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21 -# Wed Nov 21 03:10:50 2007 +# Thu Nov 22 23:05:47 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -243,6 +243,7 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set # # Power management options @@ -502,6 +503,9 @@ CONFIG_IPDDP_DECAP=y # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set +# CONFIG_NET_SCH_CLK_JIFFIES is not set +# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set +# CONFIG_NET_SCH_CLK_CPU is not set CONFIG_NET_CLS_ROUTE=y # @@ -529,8 +533,8 @@ CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y CONFIG_BT_HCIBCM203X=m -# CONFIG_BT_HCIBPA10X is not set -# CONFIG_BT_HCIBFUSB is not set +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIVHCI=m CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set @@ -1317,12 +1321,20 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y CONFIG_VIDEO_TDA9840=m CONFIG_VIDEO_TEA6415C=m CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_SAA7110=m CONFIG_VIDEO_SAA7111=m CONFIG_VIDEO_SAA7114=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_CX2341X=m CONFIG_VIDEO_SAA7185=m CONFIG_VIDEO_ADV7170=m CONFIG_VIDEO_ADV7175=m @@ -1342,36 +1354,41 @@ CONFIG_VIDEO_ZORAN_DC10=m CONFIG_VIDEO_ZORAN_DC30=m CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m -# CONFIG_VIDEO_ZORAN_AVS6EYES is not set +CONFIG_VIDEO_ZORAN_AVS6EYES=m CONFIG_VIDEO_SAA7134=m -# CONFIG_VIDEO_SAA7134_ALSA is not set +CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_MXB=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m CONFIG_VIDEO_CX88_ALSA=m -# CONFIG_VIDEO_CX88_BLACKBIRD is not set -# CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CAFE_CCIC=m # # V4L USB devices # -# CONFIG_VIDEO_PVRUSB2 is not set -# CONFIG_VIDEO_EM28XX is not set -# CONFIG_VIDEO_USBVISION is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_QUICKCAM_MESSENGER is not set -# CONFIG_USB_ET61X251 is not set +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_29XXX=y +CONFIG_VIDEO_PVRUSB2_24XXX=y +CONFIG_VIDEO_PVRUSB2_SYSFS=y +# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m CONFIG_VIDEO_OVCAMCHIP=m -# CONFIG_USB_W9968CF is not set -# CONFIG_USB_OV511 is not set -# CONFIG_USB_SE401 is not set -# CONFIG_USB_SN9C102 is not set -# CONFIG_USB_STV680 is not set -# CONFIG_USB_ZC0301 is not set +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set @@ -1381,7 +1398,7 @@ CONFIG_USB_PWC=m # CONFIG_RADIO_GEMTEK_PCI is not set # CONFIG_RADIO_MAXIRADIO is not set # CONFIG_RADIO_MAESTRO is not set -# CONFIG_USB_DSBR is not set +CONFIG_USB_DSBR=m # # Digital Video Broadcasting Devices @@ -1415,11 +1432,13 @@ CONFIG_SND_TIMER=m CONFIG_SND_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m -# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_SEQUENCER_OSS is not set # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_VERBOSE_PROCFS=y @@ -1430,6 +1449,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # Generic devices # # CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set @@ -1567,7 +1587,7 @@ CONFIG_USB_PRINTER=m CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_FREECOM is not set +CONFIG_USB_STORAGE_FREECOM=y # CONFIG_USB_STORAGE_DPCM is not set # CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set @@ -1599,9 +1619,9 @@ CONFIG_USB_KBD=m # CONFIG_USB_TOUCHSCREEN is not set CONFIG_USB_YEALINK=m # CONFIG_USB_XPAD is not set -# CONFIG_USB_ATI_REMOTE is not set -# CONFIG_USB_ATI_REMOTE2 is not set -# CONFIG_USB_KEYSPAN_REMOTE is not set +CONFIG_USB_ATI_REMOTE=m +CONFIG_USB_ATI_REMOTE2=m +CONFIG_USB_KEYSPAN_REMOTE=m # CONFIG_USB_APPLETOUCH is not set # CONFIG_USB_GTCO is not set @@ -1622,13 +1642,19 @@ CONFIG_USB_USBNET_MII=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set -# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_NET1080=m -# CONFIG_USB_NET_PLUSB is not set +CONFIG_USB_NET_PLUSB=m CONFIG_USB_NET_MCS7830=m -# CONFIG_USB_NET_RNDIS_HOST is not set -# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_NET_CDC_SUBSET=m +CONFIG_USB_ALI_M5632=y +CONFIG_USB_AN2720=y +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +CONFIG_USB_EPSON2888=y +CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_MON is not set @@ -1699,11 +1725,11 @@ CONFIG_USB_EZUSB=y # CONFIG_USB_EMI26 is not set CONFIG_USB_ADUTUX=m # CONFIG_USB_AUERSWALD is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_BERRY_CHARGE is not set -# CONFIG_USB_LED is not set +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_BERRY_CHARGE=m +CONFIG_USB_LED=m # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set CONFIG_USB_PHIDGET=m diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb index a9bacace21..e943cb47be 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb @@ -16,7 +16,7 @@ IXP4XX_KERNEL_PATCH_DIR = "2.6.21" # the changes in SVN between revisions include changes in the # patches applied to the kernel, rather than simply defconfig # changes -PR = "r1.${IXP4XX_KERNEL_SVN_REV}" +PR = "r2.${IXP4XX_KERNEL_SVN_REV}" require ixp4xx-kernel.inc require ixp4xx-kernel-svnpatch.inc diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_git.bb index b76fbbb317..750be1a648 100644 --- a/packages/linux/linux-hackndev-2.6_svn.bb +++ b/packages/linux/linux-hackndev-2.6_git.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." HOMEPAGE = "http://www.hackndev.com/" SECTION = "kernel" LICENSE = "GPL" -PR = "r11" +PR = "r12" COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)" -SRC_URI = "svn://hackndev.svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \ +SRC_URI = "git://git.hackndev.com/git/linux-hnd;protocol=http \ file://defconfig" SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \ @@ -19,7 +19,7 @@ S = "${WORKDIR}/trunk" K_MAJOR = "2" K_MINOR = "6" K_MICRO = "21" -HHV="hnd2" +HHV="hnd3" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-${HHV}" inherit kernel @@ -82,3 +82,4 @@ do_deploy() { do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile + diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 4badaa1b90..e914865e9b 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r41" +PR = "r42" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -48,6 +48,7 @@ SLUGOS_PACKAGES = "\ cherokee \ coreutils \ cron \ + cryptsetup \ ctorrent \ ctrlproxy \ cups \ 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_svn.bb b/packages/mpfr/mpfr-native_svn.bb new file mode 100644 index 0000000000..51b0f0a5d5 --- /dev/null +++ b/packages/mpfr/mpfr-native_svn.bb @@ -0,0 +1,3 @@ +require mpfr_svn.bb +inherit native +DEPENDS = "gmp-native" diff --git a/packages/mpfr/mpfr.inc b/packages/mpfr/mpfr.inc new file mode 100644 index 0000000000..cf898b62b6 --- /dev/null +++ b/packages/mpfr/mpfr.inc @@ -0,0 +1,6 @@ +DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding" +HOMEPAGE = "http://www.mpfr.org/" +LICENSE = "LGPL" +SECTION = "libs" + +inherit autotools diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb index 10383b1caa..a42498cfd4 100644 --- a/packages/mpfr/mpfr_2.1.1.bb +++ b/packages/mpfr/mpfr_2.1.1.bb @@ -1,14 +1,11 @@ -DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding" -LICENSE = "LGPL" -SECTION = "libs" +require mpfr.inc + DEPENDS = "gmp" -PR = "r2" +PR = "r3" 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} \ diff --git a/packages/mpfr/mpfr_2.3.0.bb b/packages/mpfr/mpfr_2.3.0.bb index 2acd7da3e4..92fbe7bd4b 100644 --- a/packages/mpfr/mpfr_2.3.0.bb +++ b/packages/mpfr/mpfr_2.3.0.bb @@ -1,19 +1,15 @@ -DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding" -LICENSE = "LGPL" -SECTION = "libs" +require mpfr.inc + DEPENDS = "gmp" -PR = "r0" +PR = "r1" 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 + datadir=${STAGING_DATADIR} } diff --git a/packages/mpfr/mpfr_cvs.bb b/packages/mpfr/mpfr_cvs.bb deleted file mode 100644 index fcea24633a..0000000000 --- a/packages/mpfr/mpfr_cvs.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding" -LICENSE = "LGPL" -SECTION = "libs" -DEPENDS = "gmp" -PV = "0.0+cvs${SRCDATE}" -PR = "r1" - -SRC_URI = "cvs://cvs:@cvs-sop.inria.fr/CVS/spaces;module=mpfr;method=pserver" -S = "${WORKDIR}/mpfr" - -inherit autotools - -do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} -} diff --git a/packages/mpfr/mpfr_svn.bb b/packages/mpfr/mpfr_svn.bb new file mode 100644 index 0000000000..da6036e69f --- /dev/null +++ b/packages/mpfr/mpfr_svn.bb @@ -0,0 +1,16 @@ +require mpfr.inc + +DEPENDS = "gmp" +PV = "0.0+svn${SRCDATE}" +PR = "r3" + +SRC_URI = "svn://scm.gforge.inria.fr/svn/mpfr;module=trunk" +S = "${WORKDIR}/trunk" + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/octave/files/.mtn2git_empty b/packages/octave/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/octave/files/.mtn2git_empty diff --git a/packages/octave/files/configure.patch b/packages/octave/files/configure.patch new file mode 100644 index 0000000000..f94e5ae8c0 --- /dev/null +++ b/packages/octave/files/configure.patch @@ -0,0 +1,15 @@ +--- octave-2.9.17/configure.old 2007-11-17 18:57:35.000000000 -0600 ++++ octave-2.9.17/configure 2007-11-17 19:08:33.000000000 -0600 +@@ -22598,11 +22598,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLA + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + if test "$cross_compiling" = yes; then +- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ++ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run test program while cross compiling + See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ diff --git a/packages/octave/octave_2.1.71.bb b/packages/octave/octave.inc index 22c4d69393..414f95bf83 100644 --- a/packages/octave/octave_2.1.71.bb +++ b/packages/octave/octave.inc @@ -2,16 +2,28 @@ DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numer It provides a convenient command line interface for solving linear and nonlinear problems numerically, \ and for performing other numerical experiments using a language that is mostly compatible with Matlab. \ It may also be used as a batch-oriented language." -SECTION = "console/utils" +HOMEPAGE = "http://www.gnu.org/software/octave/" +SECTION = "console/scientific" LICENSE = "GPL" -DEPENDS = "readline ncurses" -SRC_URI = "ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-${PV}.tar.gz" +DEPENDS = "readline ncurses fftw" +RDEPENDS = "libfftw3" +# fftw compiled with --disable-fortran inherit autotools -FILES_${PN}-dev += "${libdir}/octave-${PV}/*.la ${libdir}/octave-${PV}/*.a" +EXTRA_OECONF = "--without-hdf5" do_configure() { gnu-configize oe_runconf } + +PACKAGES =+ "octave-m" + +# octave-m provides matlab routines in .m file format +FILES_${PN}-m = "${datadir}/${PN}/*" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/octave/octave_2.1.73.bb b/packages/octave/octave_2.1.73.bb new file mode 100644 index 0000000000..a6bf240732 --- /dev/null +++ b/packages/octave/octave_2.1.73.bb @@ -0,0 +1,11 @@ +require octave.inc + +SRC_URI = "ftp://ftp.octave.org/pub/octave/obsolete/${PN}-${PV}.tar.gz" + +PR = "r0" + +PACKAGES =+ "libcruft-dev liboctave-dev liboctinterp-dev" + +FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft*" +FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave*" +FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp*" diff --git a/packages/octave/octave_2.9.17.bb b/packages/octave/octave_2.9.17.bb new file mode 100644 index 0000000000..5473e0d99e --- /dev/null +++ b/packages/octave/octave_2.9.17.bb @@ -0,0 +1,27 @@ +require octave.inc + +SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \ + file://configure.patch;patch=1" + +PR = "r0" + +PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \ + libcruft-dev liboctave-dev liboctinterp-dev \ + libcruft-dbg liboctave-dbg liboctinterp-dbg" + +FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*" +FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so" +FILES_libcruft-dbg = "${libdir}/${PN}-${PV}/.debug/libcruft*" + +FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*" +FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so" +FILES_liboctave-dbg = "${libdir}/${PN}-${PV}/.debug/liboctave*" + +FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*" +FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so" +FILES_liboctinterp-dbg = "${libdir}/${PN}-${PV}/.debug/liboctinterp*" + +# octave-oct provides subroutines in .oct file format +FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct" + +FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug" diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb index 8a2e354349..e627e60bd2 100644 --- a/packages/openmoko2/neod_svn.bb +++ b/packages/openmoko2/neod_svn.bb @@ -19,6 +19,7 @@ EXTRA_OECONF_rokre2 = "--with-platform=ezx" EXTRA_OECONF_rokre6 = "--with-platform=ezx" EXTRA_OECONF_magician = "--with-platform=htc" EXTRA_OECONF_hx4700 = "--with-platform=ipaq" +EXTRA_OECONF_htcuniversal = "--with-platform=htc" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index 00b2e5e627..5d2683e0fd 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/pim" -DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio" +DEPENDS = "libjana libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio" PV = "0.1.0+svnr${SRCREV}" PR = "r5" PE = "1" diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index e7b00e3316..76e0b843f7 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,10 +2,12 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r70" +PR = "r71" inherit task +XSERVER ?= "xserver-kdrive-fbdev" + PACKAGES = "\ task-openmoko-linux \ task-openmoko-ui \ @@ -46,6 +48,7 @@ RDEPENDS_task-openmoko-linux = "\ # task-openmoko-ui # DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface" +PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}" RDEPENDS_task-openmoko-ui = "\ gdk-pixbuf-loader-png \ gdk-pixbuf-loader-gif \ @@ -55,7 +58,7 @@ RDEPENDS_task-openmoko-ui = "\ pango-module-basic-fc \ gtk+ \ matchbox-wm \ - xserver-kdrive-fbdev \ + ${XSERVER} \ xserver-kdrive-common \ xserver-nodm-init \ xauth \ diff --git a/packages/uclibc/uclibc-0.9.29/qemux86/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/qemux86/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/qemux86/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/qemux86/uClibc.machine b/packages/uclibc/uclibc-0.9.29/qemux86/uClibc.machine new file mode 100644 index 0000000000..44fec169c8 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/qemux86/uClibc.machine @@ -0,0 +1,68 @@ +# +# Automatically generated make config: don't edit +# Fri Nov 23 15:49:33 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +TARGET_i386=y +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="i386" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_GENERIC_386=y +# CONFIG_386 is not set +# CONFIG_486 is not set +# CONFIG_586 is not set +# CONFIG_586MMX is not set +# CONFIG_686 is not set +# CONFIG_PENTIUMII is not set +# CONFIG_PENTIUMIII is not set +# CONFIG_PENTIUM4 is not set +# CONFIG_K6 is not set +# CONFIG_K7 is not set +# CONFIG_ELAN is not set +# CONFIG_CRUSOE is not set +# CONFIG_WINCHIPC6 is not set +# CONFIG_WINCHIP2 is not set +# CONFIG_CYRIXIII is not set +# CONFIG_NEHEMIAH is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_LITTLE_ENDIAN=y + +# +# Using Little Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/webcam-server/webcam-server_0.50.bb b/packages/webcam-server/webcam-server_0.50.bb index df7873c382..db28520606 100644 --- a/packages/webcam-server/webcam-server_0.50.bb +++ b/packages/webcam-server/webcam-server_0.50.bb @@ -11,8 +11,12 @@ DESCRIPTION = "webcam_server is a program that allows others to view your webcam HOMEPAGE = "http://webcamserver.sourceforge.net/" LICENSE = "GPL" +PR = "r1" + ###################################################################################### +DEPENDS = "jpeg" + SRC_URI = "${SOURCEFORGE_MIRROR}/webcamserver/webcam_server-${PV}.tar.gz" S = "${WORKDIR}/webcam_server-${PV}" diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver index c5c0fd6cac..ac6de5d82e 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver +++ b/packages/xserver-kdrive-common/xserver-kdrive-common/Xserver @@ -2,7 +2,6 @@ # # note xinit needs full server path -XSERVER=/usr/bin/Xipaq if [ -f /usr/bin/Xfbdev ]; then XSERVER=/usr/bin/Xfbdev fi @@ -12,9 +11,6 @@ fi if [ -f /usr/bin/Xorg ]; then XSERVER=/usr/bin/Xorg fi -if [ -f /usr/bin/Xomap ]; then - XSERVER=/usr/bin/Xomap -fi . /etc/profile @@ -104,15 +100,29 @@ case `module_id` in "Compulab CM-x270") modprobe mbxfb ARGS="$ARGS -fb /dev/fb1" ;; - "GTA01" | "GTA02") + "GTA01") if [ `screen_width` -gt 330 ] ; then DPI=285 else DPI=140 fi ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE}" ;; + "GTA02") + if [ `screen_width` -gt 330 ] ; then + DPI=285 + else + DPI=140 + fi + ARGS="$ARGS -dpi ${DPI} -screen ${SCREEN_SIZE}" + # uncomment the line below if you want to test Xglamo + #XSERVER=/usr/bin/Xglamo + ;; + "Nokia N770") + ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" + XSERVER=/usr/bin/Xomap ;; "Nokia N800") - ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;; + ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" + XSERVER=/usr/bin/Xomap ;; "Motorola Ezx Platform") ARGS="$ARGS -dpi 170 -screen ${SCREEN_SIZE}" ;; *) diff --git a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index 93b9d9e83d..db50c6c1c4 100644 --- a/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit" -PR = "r21" +PR = "r24" SRC_URI = "\ file://Xdefaults \ diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index ec8f16c9bf..ee4c85e646 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update" DEPENDS = "encdec-updater-native" LICENSE = "zaurus-updater" -PR = "r9" +PR = "r13" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh index d6e5b7fc15..709cbbc9a9 100644 --- a/packages/zaurus-updater/zaurus-updater/updater.sh +++ b/packages/zaurus-updater/zaurus-updater/updater.sh @@ -20,12 +20,12 @@ # - size check unbreak # - c760/c860 has bigger rootfs - use it # - -date_log() -{ - echo "$LOG: `date`" -} -LOG="updater start"; date_log +# 2007.11.23 Koen Kooi +# - consistent error messages +## - fix flashing from case sensitive filesystem (e.g. ext2) +# 2007.11.23 Matthias 'CoreDump' Hentges +# - Always treat MTD_PART_SIZE as HEX when comparing sizes +# - Thanks to ZeroChaos for debugging DATAPATH=$1 TMPPATH=/tmp/update @@ -41,10 +41,8 @@ if [ "$RO_MTD_LINE" = "" ]; then RO_MTD_LINE=`cat /proc/mtd | grep "\<NAND\>.*\<2\>" | tail -n 1` fi RO_MTD_NO=`echo $RO_MTD_LINE | cut -d: -f1 | cut -dd -f2` -RO_MTD_SIZE_HEX=`echo $RO_MTD_LINE | cut -d" " -f2` RO_MTD=/dev/mtd$RO_MTD_NO - -echo "RO_MTD = $RO_MTD" +ROOTFS_SIZE=`echo $RO_MTD_LINE | cut -d" " -f2` LOGOCAL_MTD=/dev/mtd1 @@ -80,7 +78,7 @@ check_for_hdd() { IDE1=`get_dev_pcmcia_slot 1` if [ "$IDE1" = "" ]; then - echo "Error!! There is no microdrive. Retrying..." + echo "Error: There is no microdrive. Retrying..." while [ "$IDE1" = "" ]; do IDE1=`get_dev_pcmcia_slot 1` done @@ -103,7 +101,7 @@ check_for_tar() done if [ ! -e $TARBIN ]; then - echo 'ERRROR: Please place a valid copy of tar as "gnu-tar" on your card.' + echo 'Error: Please place a valid copy of tar as "gnu-tar" on your card.' echo 'Please reset' while true do @@ -122,13 +120,13 @@ do_rootfs_extraction() mke2fs $MKE2FSOPT /dev/${IDE1}1 > /dev/null 2>&1 e2fsck -p /dev/${IDE1}1 > /dev/null if [ "$?" != "0" ]; then - echo "ERROR: Unable to create filesystem on microdrive!" + echo "Error: Unable to create filesystem on microdrive!" exit "$?" fi mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1 if [ "$?" != "0" ]; then - echo "ERROR: Unable to mount microdrive!" + echo "Error: Unable to mount microdrive!" exit "$?" fi @@ -136,7 +134,7 @@ do_rootfs_extraction() echo 'Now extracting...' gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf - if [ "$?" != "0" ]; then - echo "ERROR: Unable to extract root filesystem archive!" + echo "Error: Unable to extract root filesystem archive!" exit "$?" fi @@ -152,7 +150,8 @@ do_flashing() { if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ] then - echo "ERROR: File is too big to flash!" + echo "Error: File is too big to flash!" + echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]" return fi @@ -167,9 +166,7 @@ do_flashing() if [ $ISFORMATTED = 0 ] then - LOG="flash erasing ($TARGET_MTD) start"; date_log /sbin/eraseall $TARGET_MTD > /dev/null 2>&1 - LOG="flash erasing ($TARGET_MTD) end"; date_log ISFORMATTED=1 fi @@ -184,7 +181,6 @@ do_flashing() if [ -e $TMPHEAD ] then - LOG="nandlogical read start"; date_log VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp' MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp' /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 @@ -192,7 +188,6 @@ do_flashing() /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 - LOG="nandlogical read end"; date_log fi #loop @@ -209,7 +204,7 @@ do_flashing() then next_addr=`/sbin/nandcp -a $ADDR $TMPDATA $TARGET_MTD 2>/dev/null | fgrep "mtd address" | cut -d- -f2 | cut -d\( -f1` if [ "$next_addr" = "" ]; then - echo "ERROR: flash write" + echo "Error: flash write" rm $TMPDATA > /dev/null 2>&1 RESULT=3 break; @@ -240,16 +235,12 @@ do_flashing() then if [ -e $VTMPNAME ] then - LOG="nandlogical write2 start"; date_log /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 - LOG="nandlogical write2 end"; date_log rm -f $VTMPNAME > /dev/null 2>&1 fi if [ -e $MTMPNAME ] then - LOG="nandlogical write3 start"; date_log /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 - LOG="nandlogical write3 end"; date_log rm -f $MTMPNAME > /dev/null 2>&1 fi echo 'Done.' @@ -264,27 +255,18 @@ MODEL=`cat /proc/deviceinfo/product` case "$MODEL" in SL-B500|SL-5600) ZAURUS='poodle' - ROOTFS_SIZE=0x1600000 ;; SL-6000) ZAURUS='tosa' - ROOTFS_SIZE=0x1E00000 ;; SL-C1000) ZAURUS='akita' - ROOTFS_SIZE=0x1900000 ;; - SL-C700|SL-C750|SL-7500) + SL-C700|SL-C750|SL-7500|SL-C760|SL-C860) ZAURUS='c7x0' - ROOTFS_SIZE=0x1900000 - ;; - SL-C760|SL-C860) - ZAURUS='c7x0' - ROOTFS_SIZE=0x3500000 ;; SL-C3000|SL-C3100|SL-C3200) ZAURUS='c3x00' - ROOTFS_SIZE=0x0500000 check_for_hdd check_for_tar ;; @@ -302,8 +284,6 @@ echo 'MODEL: '$MODEL' ('$ZAURUS')' mkdir -p $TMPPATH > /dev/null 2>&1 -LOG="updater after model"; date_log - cd $DATAPATH/ for TARGETFILE in zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ @@ -338,11 +318,9 @@ do HDTOP=`expr $DATASIZE - 16` /sbin/bcut -a $HDTOP -s 16 -o $TMPHEAD $TARGETFILE echo "HDTOP=$HDTOP" - LOG="updater flashing kernel start"; date_log FLASH_TYPE="kernel" do_flashing FLASH_TYPE="" - LOG="updater flashing kernel end"; date_log ;; initrd.bin) @@ -354,18 +332,16 @@ do FLASHED_ROOTFS=1 ISLOGICAL=0 MODULEID=6 - MTD_PART_SIZE=$ROOTFS_SIZE + MTD_PART_SIZE="0x$ROOTFS_SIZE" ADDR=0 ISFORMATTED=0 TARGET_MTD=$RO_MTD DATAPOS=16 ONESIZE=1048576 /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE - LOG="updater flashing rootfs start"; date_log FLASH_TYPE="rootfs" do_flashing FLASH_TYPE="" - LOG="updater flashing rootfs end"; date_log ;; hdimage1.tgz) diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index aa503f273a..f2d1f640b1 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Daemon to handle device specifc features." SECTION = "base" LICENSE = "GPL" -DEPENDS = "tslib" -RDEPENDS = "procps" +DEPENDS = "tslib gpe-conf" +RDEPENDS = "procps gpe-conf" PV = "0.0+svn${SRCDATE}" -PR = "r11" +PR = "r12" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ |