From c6085182fd76b38e1f451ab61414b0bcccd10726 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Tue, 20 Nov 2007 23:40:11 +0000 Subject: busybox-static 1.2.1: Enable support for -t & -n options for read command. * These are timeout and num chars to read options, both are useful when writing UI interaction code, with busybox-static being targetted at writing bootloader tools and stuff. --- packages/busybox/busybox-static-1.2.1/defconfig | 4 ++-- packages/busybox/busybox-static_1.2.1.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') 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" -- cgit v1.2.3 From 65fe7a50164012f345b5dc1a5ebffa24e40dde92 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 21 Nov 2007 08:04:43 +0000 Subject: fftw: add RPROVIDES libfftw3 --- packages/fftw/fftw.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') 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" -- cgit v1.2.3 From c690d0aa1271976295342130e104f37660ee10e3 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 21 Nov 2007 08:52:51 +0000 Subject: octave: add buidable stable 2.1.73 and testing 2.9.17 --- packages/octave/files/.mtn2git_empty | 0 packages/octave/files/configure.patch | 15 +++++++++++++++ packages/octave/octave.inc | 29 +++++++++++++++++++++++++++++ packages/octave/octave_2.1.71.bb | 17 ----------------- packages/octave/octave_2.1.73.bb | 11 +++++++++++ packages/octave/octave_2.9.17.bb | 27 +++++++++++++++++++++++++++ 6 files changed, 82 insertions(+), 17 deletions(-) create mode 100644 packages/octave/files/.mtn2git_empty create mode 100644 packages/octave/files/configure.patch create mode 100644 packages/octave/octave.inc delete mode 100644 packages/octave/octave_2.1.71.bb create mode 100644 packages/octave/octave_2.1.73.bb create mode 100644 packages/octave/octave_2.9.17.bb (limited to 'packages') diff --git a/packages/octave/files/.mtn2git_empty b/packages/octave/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 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.inc b/packages/octave/octave.inc new file mode 100644 index 0000000000..414f95bf83 --- /dev/null +++ b/packages/octave/octave.inc @@ -0,0 +1,29 @@ +DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \ +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." +HOMEPAGE = "http://www.gnu.org/software/octave/" +SECTION = "console/scientific" +LICENSE = "GPL" +DEPENDS = "readline ncurses fftw" +RDEPENDS = "libfftw3" +# fftw compiled with --disable-fortran + +inherit autotools + +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.71.bb b/packages/octave/octave_2.1.71.bb deleted file mode 100644 index 22c4d69393..0000000000 --- a/packages/octave/octave_2.1.71.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "GNU Octave is a high-level language, primarily intended for numerical computations. \ -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" -LICENSE = "GPL" -DEPENDS = "readline ncurses" -SRC_URI = "ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-${PV}.tar.gz" - -inherit autotools - -FILES_${PN}-dev += "${libdir}/octave-${PV}/*.la ${libdir}/octave-${PV}/*.a" - -do_configure() { - gnu-configize - oe_runconf -} 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" -- cgit v1.2.3 From 220023a1bd25f3f3e81e89e56b1e707fe1e29949 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 21 Nov 2007 09:03:05 +0000 Subject: gcc-(cross)_4.1.2: enable gfortran and gfortran packaging --- packages/gcc/gcc-package.inc | 8 ++++++++ packages/gcc/gcc3-build.inc | 2 +- packages/gcc/gcc_4.1.2.bb | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc index 82bf78db80..1eee631e33 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" @@ -115,9 +121,11 @@ do_install () { # Symlinks so we can use these trivially on the target ln -sf ${TARGET_SYS}-g77 g77 + ln -sf ${TARGET_SYS}-gfortran gfortran ln -sf ${TARGET_SYS}-g++ g++ ln -sf ${TARGET_SYS}-gcc gcc ln -sf g77 f77 + ln -sf gfortran f95 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.2.bb b/packages/gcc/gcc_4.1.2.bb index 0f8cfa46b4..719379c805 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -39,6 +39,7 @@ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " #Set the fortran bits # ',fortran' or '', not 'f77' like gcc3 had FORTRAN = "" +FORTRAN_linux-gnueabi = ",fortran" #Set the java bits JAVA = "" -- cgit v1.2.3 From 6a79b3cb774592d82a7d3aeaaa1d31119bda79b8 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 22 Nov 2007 02:32:52 +0000 Subject: mpfr: add (native)_2.3.0, unify, closes #3339 --- packages/mpfr/mpfr-native_2.3.0.bb | 4 ++++ packages/mpfr/mpfr.inc | 6 ++++++ packages/mpfr/mpfr_2.1.1.bb | 10 ++++------ packages/mpfr/mpfr_2.3.0.bb | 16 ++++++++++++++++ packages/mpfr/mpfr_cvs.bb | 10 ++++------ 5 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 packages/mpfr/mpfr-native_2.3.0.bb create mode 100644 packages/mpfr/mpfr.inc create mode 100644 packages/mpfr/mpfr_2.3.0.bb (limited to 'packages') 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.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..6127e5dae9 100644 --- a/packages/mpfr/mpfr_2.1.1.bb +++ b/packages/mpfr/mpfr_2.1.1.bb @@ -1,14 +1,12 @@ -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 new file mode 100644 index 0000000000..f9d3b44d0b --- /dev/null +++ b/packages/mpfr/mpfr_2.3.0.bb @@ -0,0 +1,16 @@ +require mpfr.inc + +DEPENDS = "gmp" + +PR = "r0" + +SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2" +S = "${WORKDIR}/mpfr-${PV}" + +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_cvs.bb b/packages/mpfr/mpfr_cvs.bb index fcea24633a..14b762408c 100644 --- a/packages/mpfr/mpfr_cvs.bb +++ b/packages/mpfr/mpfr_cvs.bb @@ -1,15 +1,13 @@ -DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding" -LICENSE = "LGPL" -SECTION = "libs" +require mpfr.inc + DEPENDS = "gmp" + PV = "0.0+cvs${SRCDATE}" -PR = "r1" +PR = "r2" 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} \ -- cgit v1.2.3 From 8c972aa2eff2f3541a4064adcd403416d890794e Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 22 Nov 2007 12:02:30 +0000 Subject: xserver-kdrive_1.3.0.0.bb : fix x86 breakage with glamo patch --- .../xserver-kdrive-1.3.0.0/build-glamo.patch | 67 +++++++++++++--------- packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 2 +- 2 files changed, 42 insertions(+), 27 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch index f4757ce3c9..208e599ee1 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/build-glamo.patch @@ -1,8 +1,16 @@ -diff --git a/configure.ac b/configure.ac -index 76d33f0..2807c50 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1824,6 +1824,7 @@ hw/kdrive/ati/Makefile +Index: xorg-server-1.3.0.0/configure.ac +=================================================================== +--- xorg-server-1.3.0.0.orig/configure.ac 2007-11-22 17:40:34.000000000 +0800 ++++ xorg-server-1.3.0.0/configure.ac 2007-11-22 17:59:56.000000000 +0800 +@@ -1576,6 +1576,7 @@ + AM_CONDITIONAL(H3600_TS, false) + AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes]) + AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes]) ++AM_CONDITIONAL(KDRIVEGLAMO, [test x"$ac_cv_header_sys_vm86_h" = xyes -o x"$ac_cv_header_linux_fb_h" = xyes]) + + # Xephyr needs nanosleep() which is in librt on Solaris + AC_CHECK_FUNC([nanosleep], [], +@@ -1824,6 +1825,7 @@ hw/kdrive/chips/Makefile hw/kdrive/ephyr/Makefile hw/kdrive/epson/Makefile @@ -10,30 +18,37 @@ index 76d33f0..2807c50 100644 hw/kdrive/fake/Makefile hw/kdrive/fbdev/Makefile hw/kdrive/w100/Makefile -diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am -index 8075a56..b97912d 100644 ---- a/hw/kdrive/Makefile.am -+++ b/hw/kdrive/Makefile.am -@@ -4,7 +4,7 @@ VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ - endif - - if KDRIVEFBDEV --FBDEV_SUBDIRS = fbdev epson -+FBDEV_SUBDIRS = fbdev epson glamo +Index: xorg-server-1.3.0.0/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server-1.3.0.0.orig/hw/kdrive/Makefile.am 2007-11-22 17:40:34.000000000 +0800 ++++ xorg-server-1.3.0.0/hw/kdrive/Makefile.am 2007-11-22 17:54:54.000000000 +0800 +@@ -7,6 +7,10 @@ + FBDEV_SUBDIRS = fbdev epson endif ++if KDRIVEGLAMO ++GLAMO_SUBDIRS = glamo ++endif ++ if KDRIVEW100 -@@ -34,4 +34,4 @@ SUBDIRS = \ + W100_SUBDIRS = w100 + endif +@@ -30,8 +34,9 @@ + $(FBDEV_SUBDIRS) \ + $(W100_SUBDIRS) \ + $(VESA_SUBDIRS) \ ++ $(GLAMO_SUBDIRS) \ + $(XEPHYR_SUBDIRS) \ fake DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \ - smi via fbdev sdl ephyr src linux fake sis300 + smi via fbdev sdl ephyr src linux fake sis300 glamo -diff --git a/hw/kdrive/glamo/Makefile.am b/hw/kdrive/glamo/Makefile.am -index e8c48a4..ffb7a30 100644 ---- a/hw/kdrive/glamo/Makefile.am -+++ b/hw/kdrive/glamo/Makefile.am -@@ -41,11 +41,14 @@ GLAMO_LIBS = \ +Index: xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am +=================================================================== +--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/Makefile.am 2007-11-22 17:40:34.000000000 +0800 ++++ xorg-server-1.3.0.0/hw/kdrive/glamo/Makefile.am 2007-11-22 17:40:35.000000000 +0800 +@@ -41,11 +41,14 @@ Xglamo_LDADD = \ $(GLAMO_LIBS) \ @@ -50,11 +65,11 @@ index e8c48a4..ffb7a30 100644 relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) -diff --git a/hw/kdrive/glamo/glamo_stub.c b/hw/kdrive/glamo/glamo_stub.c -index d772671..df43455 100644 ---- a/hw/kdrive/glamo/glamo_stub.c -+++ b/hw/kdrive/glamo/glamo_stub.c -@@ -49,16 +49,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) +Index: xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c +=================================================================== +--- xorg-server-1.3.0.0.orig/hw/kdrive/glamo/glamo_stub.c 2007-11-22 17:40:34.000000000 +0800 ++++ xorg-server-1.3.0.0/hw/kdrive/glamo/glamo_stub.c 2007-11-22 17:40:35.000000000 +0800 +@@ -49,16 +49,10 @@ void InitInput(int argc, char **argv) { diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 7c60fb391e..f78bef05ae 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r20" +PR = "r21" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ -- cgit v1.2.3 From 36387e28eb6cf1f1b2542ff5bbc4d185995c8076 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Nov 2007 12:05:21 +0000 Subject: initrdscripts: Introduce boot order support for universal initramfs modules. --- packages/initrdscripts/files/80-loopboot.sh | 54 ++++++++++++++++++++++ packages/initrdscripts/files/80-nfsboot.sh | 43 +++++++++++++++++ packages/initrdscripts/files/85-blockboot.sh | 8 ++++ packages/initrdscripts/files/blockboot.sh | 8 ---- packages/initrdscripts/files/loopboot.sh | 54 ---------------------- packages/initrdscripts/files/nfsboot.sh | 43 ----------------- .../initrdscripts/initramfs-module-block_0.1.bb | 4 +- .../initrdscripts/initramfs-module-loop_0.1.bb | 4 +- packages/initrdscripts/initramfs-module-nfs_0.1.bb | 4 +- 9 files changed, 111 insertions(+), 111 deletions(-) create mode 100644 packages/initrdscripts/files/80-loopboot.sh create mode 100644 packages/initrdscripts/files/80-nfsboot.sh create mode 100644 packages/initrdscripts/files/85-blockboot.sh delete mode 100644 packages/initrdscripts/files/blockboot.sh delete mode 100644 packages/initrdscripts/files/loopboot.sh delete mode 100644 packages/initrdscripts/files/nfsboot.sh (limited to 'packages') diff --git a/packages/initrdscripts/files/80-loopboot.sh b/packages/initrdscripts/files/80-loopboot.sh new file mode 100644 index 0000000000..55a1948db8 --- /dev/null +++ b/packages/initrdscripts/files/80-loopboot.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +if [ "$ROOT_DEVICE" = "/dev/loop" ]; then + loop_mount() { + loopdev=/dev/loop$loop_num + mountpt=/mnt/loop$loop_num + + [ -e $loopdev ] || mknod $loopdev b 7 $loop_num + + # if only one argument was specified, let it be path not dev + if [ -z "$path" ] && [ -n "$dev" ]; then + path="$dev" + dev="" + fi + [ -z "$offset" ] && offset=0 + + if [ -n "$dev" ]; then + hostpt=`expr "$dev" : '.*/\([^/]*\)'` + [ -z "$hostpt" ] && hostpt="$dev" + + 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" + + echo "Mounting $loopdev on $mountpt" + mkdir "$mountpt" + mount "$loopdev" "$mountpt" + cd "$mountpt" + BOOT_ROOT="$mountpt" + loop_num=`expr "$loop_num" + 1` + } + + modprobe vfat + modprobe loop + + loop_num=0 + + for arg in $CMDLINE; do + optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'` + echo $arg xxx $optarg + case $arg in + looproot=*) + dev=`expr "$optarg" : '\([^:]*\).*'` + path=`expr "$optarg" : '[^:]*:\([^:]*\).*'` + offset=`expr "$optarg" : '[^:]*:[^:]*:\([^:]*\).*'` + loop_mount ;; + esac + done +fi diff --git a/packages/initrdscripts/files/80-nfsboot.sh b/packages/initrdscripts/files/80-nfsboot.sh new file mode 100644 index 0000000000..5129a53ebb --- /dev/null +++ b/packages/initrdscripts/files/80-nfsboot.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +if [ "$ROOT_DEVICE" = "/dev/nfs" ]; then + + # These correspond to what kernel itself uses + # DO NOT CHANGE! + NFS_OPTIONS="-o nfsvers=2,nolock" + + for arg in $CMDLINE; do + echo $arg + optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'` + echo $optarg + case $arg in + nfsroot=*) + nfsroot=$optarg ;; + ip=*) + ip=$optarg ;; + esac + done + + echo $ip | (IFS=: read client_ip server_ip gw_ip netmask hostname device autoconf; \ + echo client_ip=$client_ip; + echo server_ip=$server_ip; + echo gw_ip=$gw_ip; + echo netmask=$netmask; + echo hostname=$hostname; + echo device=$device; + echo autoconf=$autoconf; + + case "$device" in + usb*) + echo "USB" + modprobe g_ether + ;; + esac + + ifconfig $device $client_ip + ) + + echo "booting from NFS: $nfsroot" + mount -t nfs $NFS_OPTIONS $nfsroot /mnt + BOOT_ROOT=/mnt +fi diff --git a/packages/initrdscripts/files/85-blockboot.sh b/packages/initrdscripts/files/85-blockboot.sh new file mode 100644 index 0000000000..567f7e29b3 --- /dev/null +++ b/packages/initrdscripts/files/85-blockboot.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# Allow booting from a normal block device. + +if [ -e "$ROOT_DEVICE" ]; then + echo "booting from: $ROOT_DEVICE" + mount "$ROOT_DEVICE" /mnt + BOOT_ROOT=/mnt +fi diff --git a/packages/initrdscripts/files/blockboot.sh b/packages/initrdscripts/files/blockboot.sh deleted file mode 100644 index 567f7e29b3..0000000000 --- a/packages/initrdscripts/files/blockboot.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# Allow booting from a normal block device. - -if [ -e "$ROOT_DEVICE" ]; then - echo "booting from: $ROOT_DEVICE" - mount "$ROOT_DEVICE" /mnt - BOOT_ROOT=/mnt -fi diff --git a/packages/initrdscripts/files/loopboot.sh b/packages/initrdscripts/files/loopboot.sh deleted file mode 100644 index 55a1948db8..0000000000 --- a/packages/initrdscripts/files/loopboot.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -if [ "$ROOT_DEVICE" = "/dev/loop" ]; then - loop_mount() { - loopdev=/dev/loop$loop_num - mountpt=/mnt/loop$loop_num - - [ -e $loopdev ] || mknod $loopdev b 7 $loop_num - - # if only one argument was specified, let it be path not dev - if [ -z "$path" ] && [ -n "$dev" ]; then - path="$dev" - dev="" - fi - [ -z "$offset" ] && offset=0 - - if [ -n "$dev" ]; then - hostpt=`expr "$dev" : '.*/\([^/]*\)'` - [ -z "$hostpt" ] && hostpt="$dev" - - 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" - - echo "Mounting $loopdev on $mountpt" - mkdir "$mountpt" - mount "$loopdev" "$mountpt" - cd "$mountpt" - BOOT_ROOT="$mountpt" - loop_num=`expr "$loop_num" + 1` - } - - modprobe vfat - modprobe loop - - loop_num=0 - - for arg in $CMDLINE; do - optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'` - echo $arg xxx $optarg - case $arg in - looproot=*) - dev=`expr "$optarg" : '\([^:]*\).*'` - path=`expr "$optarg" : '[^:]*:\([^:]*\).*'` - offset=`expr "$optarg" : '[^:]*:[^:]*:\([^:]*\).*'` - loop_mount ;; - esac - done -fi diff --git a/packages/initrdscripts/files/nfsboot.sh b/packages/initrdscripts/files/nfsboot.sh deleted file mode 100644 index 5129a53ebb..0000000000 --- a/packages/initrdscripts/files/nfsboot.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -if [ "$ROOT_DEVICE" = "/dev/nfs" ]; then - - # These correspond to what kernel itself uses - # DO NOT CHANGE! - NFS_OPTIONS="-o nfsvers=2,nolock" - - for arg in $CMDLINE; do - echo $arg - optarg=`expr "x$arg" : 'x[^=]*=\(.*\)'` - echo $optarg - case $arg in - nfsroot=*) - nfsroot=$optarg ;; - ip=*) - ip=$optarg ;; - esac - done - - echo $ip | (IFS=: read client_ip server_ip gw_ip netmask hostname device autoconf; \ - echo client_ip=$client_ip; - echo server_ip=$server_ip; - echo gw_ip=$gw_ip; - echo netmask=$netmask; - echo hostname=$hostname; - echo device=$device; - echo autoconf=$autoconf; - - case "$device" in - usb*) - echo "USB" - modprobe g_ether - ;; - esac - - ifconfig $device $client_ip - ) - - echo "booting from NFS: $nfsroot" - mount -t nfs $NFS_OPTIONS $nfsroot /mnt - BOOT_ROOT=/mnt -fi diff --git a/packages/initrdscripts/initramfs-module-block_0.1.bb b/packages/initrdscripts/initramfs-module-block_0.1.bb index a0cb2fd7fa..2c7079af61 100644 --- a/packages/initrdscripts/initramfs-module-block_0.1.bb +++ b/packages/initrdscripts/initramfs-module-block_0.1.bb @@ -1,11 +1,11 @@ SRC_URI = "file://blockboot.sh" -PR = "r2" +PR = "r3" 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 " diff --git a/packages/initrdscripts/initramfs-module-loop_0.1.bb b/packages/initrdscripts/initramfs-module-loop_0.1.bb index d4e5aa038f..afc77a46f0 100644 --- a/packages/initrdscripts/initramfs-module-loop_0.1.bb +++ b/packages/initrdscripts/initramfs-module-loop_0.1.bb @@ -1,5 +1,5 @@ SRC_URI = "file://loopboot.sh" -PR = "r3" +PR = "r4" DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \ mounting it." RDEPENDS = "initramfs-uniboot" @@ -7,7 +7,7 @@ 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 " diff --git a/packages/initrdscripts/initramfs-module-nfs_0.1.bb b/packages/initrdscripts/initramfs-module-nfs_0.1.bb index 24284d6c5f..beadcf1c35 100644 --- a/packages/initrdscripts/initramfs-module-nfs_0.1.bb +++ b/packages/initrdscripts/initramfs-module-nfs_0.1.bb @@ -1,12 +1,12 @@ SRC_URI = "file://nfsboot.sh" -PR = "r4" +PR = "r5" 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 " -- cgit v1.2.3 From 505b03b2909a607e2dd8693ef95e0d62d6f3212b Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Nov 2007 12:07:37 +0000 Subject: initrdscripts: Initial value for ROOT_DEV is null. --- packages/initrdscripts/files/init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index 8c9803f21b..261a3b8477 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -2,7 +2,7 @@ MODULE_DIR=/initrd.d BOOT_ROOT= -ROOT_DEVICE=/dev/null +ROOT_DEVICE= early_setup() { mkdir /proc -- cgit v1.2.3 From d0e74671ac72a53a9864e35e16c2d27ed91874bf Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Nov 2007 12:16:41 +0000 Subject: initrdscripts: Separate fs kernel module loading to separate plugin. --- packages/initrdscripts/files/10-initfs.sh | 5 +++++ packages/initrdscripts/files/80-loopboot.sh | 1 - packages/initrdscripts/initramfs-module-initfs_1.0.bb | 12 ++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 packages/initrdscripts/files/10-initfs.sh create mode 100644 packages/initrdscripts/initramfs-module-initfs_1.0.bb (limited to 'packages') diff --git a/packages/initrdscripts/files/10-initfs.sh b/packages/initrdscripts/files/10-initfs.sh new file mode 100644 index 0000000000..b336af6bbb --- /dev/null +++ b/packages/initrdscripts/files/10-initfs.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +modprobe vfat +modprobe ext2 +modprobe ext3 diff --git a/packages/initrdscripts/files/80-loopboot.sh b/packages/initrdscripts/files/80-loopboot.sh index 55a1948db8..7fbf69a202 100644 --- a/packages/initrdscripts/files/80-loopboot.sh +++ b/packages/initrdscripts/files/80-loopboot.sh @@ -35,7 +35,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/initramfs-module-initfs_1.0.bb b/packages/initrdscripts/initramfs-module-initfs_1.0.bb new file mode 100644 index 0000000000..f085dcd0bc --- /dev/null +++ b/packages/initrdscripts/initramfs-module-initfs_1.0.bb @@ -0,0 +1,12 @@ +SRC_URI = "file://10-initfs.sh" +PR = "r0" +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/* " -- cgit v1.2.3 From 17901ed364f1d8953445b5181d14977be561cad7 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Nov 2007 12:20:26 +0000 Subject: initrdscripts: Finish renaming for ordered module load. --- packages/initrdscripts/initramfs-module-block_0.1.bb | 11 ----------- packages/initrdscripts/initramfs-module-block_1.0.bb | 11 +++++++++++ packages/initrdscripts/initramfs-module-loop_0.1.bb | 13 ------------- packages/initrdscripts/initramfs-module-loop_1.0.bb | 13 +++++++++++++ packages/initrdscripts/initramfs-module-nfs_0.1.bb | 12 ------------ packages/initrdscripts/initramfs-module-nfs_1.0.bb | 12 ++++++++++++ 6 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 packages/initrdscripts/initramfs-module-block_0.1.bb create mode 100644 packages/initrdscripts/initramfs-module-block_1.0.bb delete mode 100644 packages/initrdscripts/initramfs-module-loop_0.1.bb create mode 100644 packages/initrdscripts/initramfs-module-loop_1.0.bb delete mode 100644 packages/initrdscripts/initramfs-module-nfs_0.1.bb create mode 100644 packages/initrdscripts/initramfs-module-nfs_1.0.bb (limited to 'packages') diff --git a/packages/initrdscripts/initramfs-module-block_0.1.bb b/packages/initrdscripts/initramfs-module-block_0.1.bb deleted file mode 100644 index 2c7079af61..0000000000 --- a/packages/initrdscripts/initramfs-module-block_0.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -SRC_URI = "file://blockboot.sh" -PR = "r3" -RDEPENDS = "initramfs-uniboot" -DESCRIPTION = "An initramfs module for booting off normal block devices." - -do_install() { - install -d ${D}/initrd.d - install -m 0755 ${WORKDIR}/85-blockboot.sh ${D}/initrd.d/ -} - -FILES_${PN} += " /initrd.d/block " diff --git a/packages/initrdscripts/initramfs-module-block_1.0.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb new file mode 100644 index 0000000000..73f7a709f1 --- /dev/null +++ b/packages/initrdscripts/initramfs-module-block_1.0.bb @@ -0,0 +1,11 @@ +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}/85-blockboot.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_0.1.bb deleted file mode 100644 index afc77a46f0..0000000000 --- a/packages/initrdscripts/initramfs-module-loop_0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SRC_URI = "file://loopboot.sh" -PR = "r4" -DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \ - mounting it." -RDEPENDS = "initramfs-uniboot" -RRECOMMENDS = "kernel-module-loop kernel-module-vfat" - -do_install() { - install -d ${D}/initrd.d - install -m 0755 ${WORKDIR}/80-loopboot.sh ${D}/initrd.d/ -} - -FILES_${PN} += " /initrd.d/loop " diff --git a/packages/initrdscripts/initramfs-module-loop_1.0.bb b/packages/initrdscripts/initramfs-module-loop_1.0.bb new file mode 100644 index 0000000000..54e7fa29e3 --- /dev/null +++ b/packages/initrdscripts/initramfs-module-loop_1.0.bb @@ -0,0 +1,13 @@ +SRC_URI = "file://80-loopboot.sh" +PR = "r0" +DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \ + mounting it." +RDEPENDS = "initramfs-uniboot" +RRECOMMENDS = "kernel-module-loop kernel-module-vfat" + +do_install() { + install -d ${D}/initrd.d + install -m 0755 ${WORKDIR}/80-loopboot.sh ${D}/initrd.d/ +} + +FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-nfs_0.1.bb b/packages/initrdscripts/initramfs-module-nfs_0.1.bb deleted file mode 100644 index beadcf1c35..0000000000 --- a/packages/initrdscripts/initramfs-module-nfs_0.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -SRC_URI = "file://nfsboot.sh" -PR = "r5" -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}/80-nfsboot.sh ${D}/initrd.d/ -} - -FILES_${PN} += " /initrd.d/nfs " diff --git a/packages/initrdscripts/initramfs-module-nfs_1.0.bb b/packages/initrdscripts/initramfs-module-nfs_1.0.bb new file mode 100644 index 0000000000..6555688fce --- /dev/null +++ b/packages/initrdscripts/initramfs-module-nfs_1.0.bb @@ -0,0 +1,12 @@ +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}/80-nfsboot.sh ${D}/initrd.d/ +} + +FILES_${PN} += " /initrd.d/nfs " -- cgit v1.2.3 From a4c96d20b0945e1bcab47041c919334ca49947b7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Nov 2007 13:14:40 +0000 Subject: zaurus-updater: dropped spitz one as unified works on spitz (tested by Rolf Leggewie) --- packages/zaurus-updater/akita/updater.sh | 84 +++---- packages/zaurus-updater/spitz/.mtn2git_empty | 0 packages/zaurus-updater/spitz/updater.sh | 280 ---------------------- packages/zaurus-updater/zaurus-updater.bb | 2 +- packages/zaurus-updater/zaurus-updater/updater.sh | 102 +++++--- 5 files changed, 107 insertions(+), 361 deletions(-) delete mode 100644 packages/zaurus-updater/spitz/.mtn2git_empty delete mode 100755 packages/zaurus-updater/spitz/updater.sh (limited to 'packages') diff --git a/packages/zaurus-updater/akita/updater.sh b/packages/zaurus-updater/akita/updater.sh index 5399e5254e..ad2c27b012 100644 --- a/packages/zaurus-updater/akita/updater.sh +++ b/packages/zaurus-updater/akita/updater.sh @@ -181,53 +181,53 @@ do /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1 /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1 - if [ "$MODEL" = "SL-C1000" ] && [ $TARGETTYPE = Kernel ]; then - echo $TARGETFILE':'$DATASIZE'bytes' - echo ' ' > /tmp/data - /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1 - #loop - else - while [ $DATAPOS -lt $DATASIZE ] - do - #data create - bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE - TMPSIZE=`wc -c $TMPDATA` - TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1` - DATAPOS=`expr $DATAPOS + $TMPSIZE` - - #handle data file - #echo 'ADDR='$ADDR - #echo 'SIZE='$TMPSIZE - #echo 'TMPDATA='$TMPDATA - if [ $ISLOGICAL = 0 ] - 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" - rm $TMPDATA > /dev/null 2>&1 - RESULT=3 - break; + if [ "$MODEL" = "SL-C1000" ] && [ $TARGETTYPE = Kernel ]; then + echo $TARGETFILE':'$DATASIZE'bytes' + echo ' ' > /tmp/data + /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1 + /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1 + /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1 + #loop + else + while [ $DATAPOS -lt $DATASIZE ] + do + #data create + bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE + TMPSIZE=`wc -c $TMPDATA` + TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1` + DATAPOS=`expr $DATAPOS + $TMPSIZE` + + #handle data file + #echo 'ADDR='$ADDR + #echo 'SIZE='$TMPSIZE + #echo 'TMPDATA='$TMPDATA + if [ $ISLOGICAL = 0 ] + 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" + rm $TMPDATA > /dev/null 2>&1 + RESULT=3 + break; + fi + ADDR=$next_addr + else + /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1 + ADDR=`expr $ADDR + $TMPSIZE` fi - ADDR=$next_addr - else - /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1 - ADDR=`expr $ADDR + $TMPSIZE` - fi - rm $TMPDATA > /dev/null 2>&1 + rm $TMPDATA > /dev/null 2>&1 - #progress - SPNUM=0 - while [ $SPNUM -lt $PROGSTEP ] - do - echo -n '.' - SPNUM=`expr $SPNUM + 1` + #progress + SPNUM=0 + while [ $SPNUM -lt $PROGSTEP ] + do + echo -n '.' + SPNUM=`expr $SPNUM + 1` + done done - done - fi + fi echo '' diff --git a/packages/zaurus-updater/spitz/.mtn2git_empty b/packages/zaurus-updater/spitz/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zaurus-updater/spitz/updater.sh b/packages/zaurus-updater/spitz/updater.sh deleted file mode 100755 index a748334cc7..0000000000 --- a/packages/zaurus-updater/spitz/updater.sh +++ /dev/null @@ -1,280 +0,0 @@ -#!/bin/sh - -# -# Noodles' simpler update script. SL-C3000 only for the moment. -# - -DATAPATH=$1 -TMPPATH=/tmp/update -TMPDATA=$TMPPATH/tmpdata.bin -TMPHEAD=$TMPPATH/tmphead.bin - -WFLG_KERNEL=0 -WFLG_INITRD=0 -WFLG_HDD=0 - -RO_MTD_LINE=`cat /proc/mtd | grep "root" | tail -n 1` -if [ "$RO_MTD_LINE" = "" ]; then - RO_MTD_LINE=`cat /proc/mtd | grep "\.*\<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 -RO_MTDBLK=/dev/mtdblock$RO_MTD_NO -RO_MTD_SIZE=`dc 0x$RO_MTD_SIZE_HEX 1024 /` - -RW_MTD_LINE=`cat /proc/mtd | grep "home" | tail -n 1` -if [ "$RW_MTD_LINE" = "" ]; then - RW_MTD_LINE=`cat /proc/mtd | grep "\.*\<2\>" | tail -n 1` -fi -RW_MTD_NO=`echo $RW_MTD_LINE | cut -d: -f1 | cut -dd -f2` -RW_MTD_SIZE_HEX=`echo $RW_MTD_LINE | cut -d" " -f2` -RW_MTD=/dev/mtd$RW_MTD_NO -RW_MTDBLK=/dev/mtdblock$RW_MTD_NO -RW_MTD_SIZE=`dc 0x$RW_MTD_SIZE_HEX 1024 /` - -LOGOCAL_MTD=/dev/mtd1 - -VERBLOCK=0x48000 -MVRBLOCK=0x70000 - -RESULT=0 - -Cleanup(){ - rm -f $VTMPNAME > /dev/null 2>&1 - rm -f $MTMPNAME > /dev/null 2>&1 - rm $CTRLPATH/* > /dev/null 2>&1 - exit $1 -} -trap 'Cleanup 1' 1 15 -trap '' 2 3 - -get_dev_pcmcia() -{ -while read SOCKET CLASS DRIVER INSTANCE DEVS MAJOR MINOR; -do - echo $DEVS -done -} -get_dev_pcmcia_slot() -{ - grep "^$1" /var/lib/pcmcia/stab | get_dev_pcmcia -} -sleep 1 -IDE1=`get_dev_pcmcia_slot 1` -if [ "$IDE1" = "" ]; then - echo "Error!! There is no HDD. Now retrying..." - while [ "$IDE1" = "" ]; do - IDE1=`get_dev_pcmcia_slot 1` - done - echo "Found HDD!!" -fi - -#LINUXFMT=ext2 -LINUXFMT=ext3 -MKE2FSOPT= -if [ "$LINUXFMT" = "ext3" ]; then - MKE2FSOPT=-j -fi - - -### Check model ### -/sbin/writerominfo -MODEL=`cat /proc/deviceinfo/product` -if [ "$MODEL" != "SL-C3000" ] && [ "$MODEL" != "SL-C3100" ] && [ "$MODEL" != "SL-C3200" ] -then - echo 'MODEL:'$MODEL - echo 'ERROR:Invalid model!' - echo 'Please reset' - while true - do - done -fi - -### Check that we have a valid tar -for TARNAME in gnu-tar GNU-TAR -do - if [ -e $DATAPATH/$TARNAME ] - then - TARBIN=$DATAPATH/$TARNAME - fi -done - -if [ ! -e $TARBIN ]; then - echo 'Please place a valid copy of tar as "gnu-tar" on your card' - echo 'Please reset' - while true - do - done -fi - -mkdir -p $TMPPATH > /dev/null 2>&1 - -cd $DATAPATH/ - -# -# First do the kernel. -# -for TARGETFILE in zImage.bin zimage.bin ZIMAGE.BIN -do - if [ -e $TARGETFILE -a $WFLG_KERNEL = 0 ] - then - # Get the size of the kernel. - DATASIZE=`wc -c $TARGETFILE` - DATASIZE=`echo $DATASIZE | cut -d' ' -f1` - - echo 'Updating kernel.' - echo $TARGETFILE':'$DATASIZE' bytes' - /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE \ - $TARGETFILE > /dev/null 2>&1 - - WFLG_KERNEL=1 - - fi -done - -# -# Now do the initrd. -# -for TARGETFILE in initrd.bin INITRD.BIN -do - if [ -e $TARGETFILE -a $WFLG_INITRD = 0 ] - then - rm -f $TMPPATH/*.bin > /dev/null 2>&1 - DATASIZE=`wc -c $TARGETFILE` - DATASIZE=`echo $DATASIZE | cut -d' ' -f1` - - WFLG_INITRD=1 - echo 'RO file system' - MODULEID=6 - MODULESIZE=0x500000 - ADDR=0 - TARGET_MTD=$RO_MTD - DATAPOS=16 - ONESIZE=1048576 - /sbin/bcut -s 16 -o $TMPHEAD $TARGETFILE - - echo -n 'Flash erasing...' - /sbin/eraseall $TARGET_MTD 2> /dev/null > /dev/null - echo 'done' - - echo '' - echo '0% 100%' - PROGSTEP=`expr $DATASIZE / $ONESIZE + 1` - PROGSTEP=`expr 28 / $PROGSTEP` - if [ $PROGSTEP = 0 ] - then - PROGSTEP=1 - fi - - #00 means header information - VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp' - MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp' - /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 - - #echo 'found header' - /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1 - /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MODULESIZE > /dev/null 2>&1 - - #loop - while [ $DATAPOS -lt $DATASIZE ] - do - #data create - bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE - TMPSIZE=`wc -c $TMPDATA` - TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1` - DATAPOS=`expr $DATAPOS + $TMPSIZE` - - #handle data file - #echo 'ADDR='$ADDR - #echo 'SIZE='$TMPSIZE - 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" - rm $TMPDATA > /dev/null 2>&1 - RESULT=3 - break; - fi - ADDR=$next_addr - - rm $TMPDATA > /dev/null 2>&1 - - #progress - SPNUM=0 - while [ $SPNUM -lt $PROGSTEP ] - do - echo -n '.' - SPNUM=`expr $SPNUM + 1` - done - done - - echo '' - - #finish - rm -f $TMPPATH/*.bin > /dev/null 2>&1 - - if [ $RESULT = 0 ] - then - /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 - - rm -f $VTMPNAME > /dev/null 2>&1 - rm -f $MTMPNAME > /dev/null 2>&1 - echo 'Success!' - else - echo 'Error!' - exit $RESULT - fi - fi -done - -## HDD image -for TARGETFILE in hdimage1.tgz HDIMAGE1.TGZ -do - if [ -e $TARGETFILE ]; then - if [ $WFLG_HDD != 0 ] - then - continue - fi - WFLG_HDD=1 - echo '' - echo 'HDD RO file system' - if [ ! -f /hdd1/NotAvailable ]; then - umount /hdd1 - fi - echo 'Now formatting...' - mke2fs $MKE2FSOPT /dev/${IDE1}1 2> /dev/null > /dev/null - e2fsck -p /dev/${IDE1}1 > /dev/null - if [ "$?" != "0" ]; then - echo "Error!" - exit "$?" - fi - - mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1 - if [ "$?" != "0" ]; then - echo "Error!" - exit "$?" - fi - - cd /hdd1 - echo 'Now extracting...' - gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf - - if [ "$?" != "0" ]; then - echo "Error!" - exit "$?" - fi - - echo 'Success!' - - #This can be useful for debugging - #/bin/sh -i - - # remount as RO - cd / - umount /hdd1 - mount -t $LINUXFMT -o ro,noatime /dev/${IDE1}1 /hdd1 - fi -done - -exit 0 diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index 9d62bd629e..ec8f16c9bf 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 = "r8" +PR = "r9" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh index b8ae625d6e..d6e5b7fc15 100644 --- a/packages/zaurus-updater/zaurus-updater/updater.sh +++ b/packages/zaurus-updater/zaurus-updater/updater.sh @@ -21,6 +21,12 @@ # - c760/c860 has bigger rootfs - use it # +date_log() +{ + echo "$LOG: `date`" +} +LOG="updater start"; date_log + DATAPATH=$1 TMPPATH=/tmp/update TMPDATA=$TMPPATH/tmpdata.bin @@ -38,6 +44,8 @@ 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" + LOGOCAL_MTD=/dev/mtd1 VERBLOCK=0x48000 @@ -159,9 +167,9 @@ do_flashing() if [ $ISFORMATTED = 0 ] then - echo -n 'Flash erasing...' + LOG="flash erasing ($TARGET_MTD) start"; date_log /sbin/eraseall $TARGET_MTD > /dev/null 2>&1 - echo 'done' + LOG="flash erasing ($TARGET_MTD) end"; date_log ISFORMATTED=1 fi @@ -176,6 +184,7 @@ 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 @@ -183,43 +192,44 @@ 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 - while [ $DATAPOS -lt $DATASIZE ] - do - #data create - bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE - TMPSIZE=`wc -c $TMPDATA` - TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1` - DATAPOS=`expr $DATAPOS + $TMPSIZE` - - #handle data file - if [ $ISLOGICAL = 0 ] - 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" - rm $TMPDATA > /dev/null 2>&1 - RESULT=3 - break; - fi - ADDR=$next_addr - else - /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1 - ADDR=`expr $ADDR + $TMPSIZE` - fi - - rm $TMPDATA > /dev/null 2>&1 - - #progress - SPNUM=0 - while [ $SPNUM -lt $PROGSTEP ] - do - echo -n '.' - SPNUM=`expr $SPNUM + 1` - done - done + #loop + while [ $DATAPOS -lt $DATASIZE ] + do + #data create + bcut -a $DATAPOS -s $ONESIZE -o $TMPDATA $TARGETFILE + TMPSIZE=`wc -c $TMPDATA` + TMPSIZE=`echo $TMPSIZE | cut -d' ' -f1` + DATAPOS=`expr $DATAPOS + $TMPSIZE` + + #handle data file + if [ $ISLOGICAL = 0 ] + 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" + rm $TMPDATA > /dev/null 2>&1 + RESULT=3 + break; + fi + ADDR=$next_addr + else + /sbin/nandlogical $LOGOCAL_MTD WRITE $ADDR $DATASIZE $TMPDATA > /dev/null 2>&1 + ADDR=`expr $ADDR + $TMPSIZE` + fi + + rm $TMPDATA > /dev/null 2>&1 + + #progress + SPNUM=0 + while [ $SPNUM -lt $PROGSTEP ] + do + echo -n '.' + SPNUM=`expr $SPNUM + 1` + done + done echo '' @@ -230,12 +240,16 @@ 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.' @@ -288,6 +302,8 @@ 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 @@ -311,7 +327,6 @@ do then continue fi - echo 'kernel' FLASHED_KERNEL=1 ISLOGICAL=1 MODULEID=5 @@ -322,7 +337,12 @@ do ONESIZE=524288 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) @@ -341,7 +361,11 @@ do 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) @@ -356,6 +380,8 @@ do esac done +/bin/sh + # reboot exit 0 -- cgit v1.2.3 From 567d05ff4a17d6b8015fc4888c94f38d296def30 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 22 Nov 2007 15:04:06 +0000 Subject: mpfr: add 2.3.0 --- packages/mpfr/mpfr-native_2.3.0.bb | 4 ++++ packages/mpfr/mpfr_2.3.0.bb | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 packages/mpfr/mpfr-native_2.3.0.bb create mode 100644 packages/mpfr/mpfr_2.3.0.bb (limited to 'packages') 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 +} -- cgit v1.2.3 From e0f4607a9d92714d1173ecfcc89cbd6af3343692 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Nov 2007 15:08:12 +0000 Subject: initrdscripts: We obviously first do rootdelay, and only then create device nodes. --- packages/initrdscripts/files/init.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index 261a3b8477..f8d5de9173 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -8,8 +8,11 @@ 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 -- cgit v1.2.3 From fcacf6ef057669597c283ed4d181dc12991334d4 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 22 Nov 2007 15:35:03 +0000 Subject: gettext: Disable java since it finds any native gcj and breaks cross compiled builds (from Poky) --- packages/gettext/gettext-0.14.1/disable_java.patch | 33 ++++++++++++++++++++++ packages/gettext/gettext_0.14.1.bb | 5 ++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 packages/gettext/gettext-0.14.1/disable_java.patch (limited to 'packages') 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" -- cgit v1.2.3 From 1ffe4a97e188cf21fe157f5a7e7841f8a2421e75 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Thu, 22 Nov 2007 16:10:32 +0000 Subject: hostap-daemon_0.6.0.bb: package version 0.6.0 of hostap-daemon * update makefile-cross.diff patch * fix init script: pass -B to hostapd instead of passing -b to start-stop-daemon * instead of using per-machine enabling/disabling of madwifi support, use the 'pci' feature, like wpa-supplicant * build against madwifi-ng when madwifi support is enabled --- packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty | 0 packages/hostap/hostap-daemon-0.6.0/init | 37 ++++++++++++++++++++ .../hostap/hostap-daemon-0.6.0/makefile-cross.diff | 25 ++++++++++++++ packages/hostap/hostap-daemon_0.6.0.bb | 40 ++++++++++++++++++++++ 4 files changed, 102 insertions(+) create mode 100644 packages/hostap/hostap-daemon-0.6.0/.mtn2git_empty create mode 100644 packages/hostap/hostap-daemon-0.6.0/init create mode 100644 packages/hostap/hostap-daemon-0.6.0/makefile-cross.diff create mode 100644 packages/hostap/hostap-daemon_0.6.0.bb (limited to 'packages') 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 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 +} + -- cgit v1.2.3 From 3138b2bd514e09b328be2922c7ef429566a89d1d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Nov 2007 16:23:37 +0000 Subject: dropbear 0.49: Beautify init script output. * Make sure that "Starting: dropbear" message is not broken by host key generation output. --- packages/dropbear/dropbear/init | 12 +++++++++--- packages/dropbear/dropbear_0.49.bb | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'packages') 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 -- cgit v1.2.3 From 425a27eae1ea6551c932f5a43715c189d031f189 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 22 Nov 2007 16:44:20 +0000 Subject: task-openmoko.bb : add openmoko-messages2 to the images --- packages/tasks/task-openmoko.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') 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 \ " # -- cgit v1.2.3 From 3d700e6647bedae4e5a2dd71efa030422b4a8913 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Nov 2007 17:26:10 +0000 Subject: initrdscripts: module-initfs: Be silent on loading non-existent module. * Use -q for modprobe, and as that apparently doesn't help bitbake's modprobe, redirect output to /dev/null. --- packages/initrdscripts/files/10-initfs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/initrdscripts/files/10-initfs.sh b/packages/initrdscripts/files/10-initfs.sh index b336af6bbb..bad649e5c2 100644 --- a/packages/initrdscripts/files/10-initfs.sh +++ b/packages/initrdscripts/files/10-initfs.sh @@ -1,5 +1,5 @@ #!/bin/sh -modprobe vfat -modprobe ext2 -modprobe ext3 +modprobe -q vfat >/dev/null 2>&1 +modprobe -q ext2 >/dev/null 2>&1 +modprobe -q ext3 >/dev/null 2>&1 -- cgit v1.2.3 From cb561eb11cc765d2314c30bb861c9187315d9efc Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Nov 2007 17:29:37 +0000 Subject: initramfs-module-loopboot: Allow to use absolute path for loop file location. --- packages/initrdscripts/files/80-loopboot.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/initrdscripts/files/80-loopboot.sh b/packages/initrdscripts/files/80-loopboot.sh index 7fbf69a202..d84244428e 100644 --- a/packages/initrdscripts/files/80-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" -- cgit v1.2.3 From efaf4ed8c1b358d20e3738bd4bac2701f5f7a56f Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Nov 2007 17:31:23 +0000 Subject: initramfs-uniboot & modules: Bump PRs for latest changes. --- packages/initrdscripts/initramfs-module-initfs_1.0.bb | 2 +- packages/initrdscripts/initramfs-module-loop_1.0.bb | 4 ++-- packages/initrdscripts/initramfs-uniboot_0.2.bb | 11 ----------- packages/initrdscripts/initramfs-uniboot_1.0.bb | 11 +++++++++++ 4 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 packages/initrdscripts/initramfs-uniboot_0.2.bb create mode 100644 packages/initrdscripts/initramfs-uniboot_1.0.bb (limited to 'packages') diff --git a/packages/initrdscripts/initramfs-module-initfs_1.0.bb b/packages/initrdscripts/initramfs-module-initfs_1.0.bb index f085dcd0bc..48ae6c2160 100644 --- a/packages/initrdscripts/initramfs-module-initfs_1.0.bb +++ b/packages/initrdscripts/initramfs-module-initfs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://10-initfs.sh" -PR = "r0" +PR = "r1" DESCRIPTION = "An initramfs module for initializing filesystems." RDEPENDS = "initramfs-uniboot" RRECOMMENDS = "kernel-module-vfat kernel-module-ext2" diff --git a/packages/initrdscripts/initramfs-module-loop_1.0.bb b/packages/initrdscripts/initramfs-module-loop_1.0.bb index 54e7fa29e3..5cc84bcaf8 100644 --- a/packages/initrdscripts/initramfs-module-loop_1.0.bb +++ b/packages/initrdscripts/initramfs-module-loop_1.0.bb @@ -1,8 +1,8 @@ SRC_URI = "file://80-loopboot.sh" -PR = "r0" +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() { diff --git a/packages/initrdscripts/initramfs-uniboot_0.2.bb b/packages/initrdscripts/initramfs-uniboot_0.2.bb deleted file mode 100644 index 46ba06ff9a..0000000000 --- a/packages/initrdscripts/initramfs-uniboot_0.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -SRC_URI = "file://init.sh" -PR = "r1" -DESCRIPTON = "A modular initramfs init script system." -RDEPENDS = "busybox-static" -RRECOMMENDS = "kernel-module-uinput" - -do_install() { - install -m 0755 ${WORKDIR}/init.sh ${D}/init -} - -FILES_${PN} += " /init " diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb new file mode 100644 index 0000000000..f8d9d76936 --- /dev/null +++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb @@ -0,0 +1,11 @@ +SRC_URI = "file://init.sh" +PR = "r0" +DESCRIPTON = "A modular initramfs init script system." +RDEPENDS = "busybox-static" +RRECOMMENDS = "kernel-module-uinput" + +do_install() { + install -m 0755 ${WORKDIR}/init.sh ${D}/init +} + +FILES_${PN} += " /init " -- cgit v1.2.3 From 05bfd48554e5a46039a0b7370dae0deed6f0c2d6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Nov 2007 17:34:24 +0000 Subject: initramfs-module-bootmenu: Interactive boot location selection for initramfs-uniboot. * For now, supports booting from ext2/ext3 partitions and from ext2/ext3 loopback images placed on vfat partition. --- packages/initrdscripts/files/30-bootmenu.sh | 154 +++++++++++++++++++++ .../initrdscripts/initramfs-module-bootmenu_1.0.bb | 11 ++ 2 files changed, 165 insertions(+) create mode 100644 packages/initrdscripts/files/30-bootmenu.sh create mode 100644 packages/initrdscripts/initramfs-module-bootmenu_1.0.bb (limited to 'packages') 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/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/* " -- cgit v1.2.3 From 1bb9d2af64dfe2847e21dc28934c7a8a03a01b9e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 22 Nov 2007 18:27:22 +0000 Subject: busybox: Enable support for -t & -n options for read command in angstrom configs. * These are timeout and num chars to read options, both are useful when writing UI interaction code, with busybox-static being targetted at writing bootloader tools and stuff. --- packages/busybox/busybox-1.2.0/angstrom/defconfig | 4 +- packages/busybox/busybox-1.2.1/angstrom/defconfig | 4 +- packages/busybox/busybox-1.2.2/angstrom/defconfig | 4 +- packages/busybox/busybox-1.3.1/angstrom/defconfig | 4 +- packages/busybox/busybox-1.5.0/angstrom/defconfig | 4 +- packages/busybox/busybox-1.6.0/angstrom/defconfig | 4 +- .../busybox/busybox-1.7.2/angstrom/.mtn2git_empty | 0 packages/busybox/busybox-1.7.2/angstrom/defconfig | 753 +++++++++++++++++++++ packages/busybox/busybox-1.7.2/defconfig | 753 --------------------- packages/busybox/busybox_1.00.bb | 2 +- packages/busybox/busybox_1.01.bb | 2 +- packages/busybox/busybox_1.2.0.bb | 2 +- packages/busybox/busybox_1.2.1.bb | 2 +- packages/busybox/busybox_1.2.2.bb | 2 + packages/busybox/busybox_1.3.1.bb | 2 + packages/busybox/busybox_1.5.0.bb | 2 +- packages/busybox/busybox_1.6.0.bb | 2 +- packages/busybox/busybox_1.7.2.bb | 2 +- 18 files changed, 776 insertions(+), 772 deletions(-) create mode 100644 packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.7.2/angstrom/defconfig delete mode 100644 packages/busybox/busybox-1.7.2/defconfig (limited to 'packages') 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 diff --git a/packages/busybox/busybox-1.7.2/angstrom/defconfig b/packages/busybox/busybox-1.7.2/angstrom/defconfig new file mode 100644 index 0000000000..30e71e8ffe --- /dev/null +++ b/packages/busybox/busybox-1.7.2/angstrom/defconfig @@ -0,0 +1,753 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.7.2 +# Fri Oct 12 19:00:27 2007 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_DESKTOP is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +CONFIG_FEATURE_COMPRESS_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_BUILD_AT_ONCE=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +# CONFIG_INCLUDE_SUSv2 is not set + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 +CONFIG_FEATURE_FAST_TOP=y +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +# CONFIG_FEATURE_EDITING_FANCY_KEYS is not set +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY=15 +CONFIG_FEATURE_EDITING_SAVEHISTORY=y +CONFIG_FEATURE_TAB_COMPLETION=y +CONFIG_FEATURE_USERNAME_COMPLETION=y +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +# CONFIG_FEATURE_RPM_BZ2 is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_SPLIT is not set +# CONFIG_FEATURE_SPLIT_FANCY is not set +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WC=y +# CONFIG_FEATURE_WC_LARGE is not set +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +# CONFIG_RESIZE is not set +# CONFIG_FEATURE_RESIZE_PRINT is not set +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_CMP is not set +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=1024 +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_UTMP=y +# CONFIG_FEATURE_WTMP is not set +# CONFIG_LOGIN is not set +# CONFIG_PAM is not set +# CONFIG_LOGIN_SCRIPTS is not set +# CONFIG_FEATURE_NOLOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set +# CONFIG_CRYPTPW is not set +# CONFIG_CHPASSWD is not set +# CONFIG_SU is not set +# CONFIG_FEATURE_SU_SYSLOG is not set +# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y +CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +CONFIG_FSCK_MINIX=y +CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# +CONFIG_FEATURE_MINIX2=y +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +# CONFIG_FEATURE_MOUNT_CIFS is not set +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CHRT is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +CONFIG_TIME=y +# CONFIG_TTYSIZE is not set +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_ARP is not set +# CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +# CONFIG_FEATURE_IP_RULE is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPRULE is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +# CONFIG_NC_SERVER is not set +# CONFIG_NC_EXTRA is not set +CONFIG_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_PING6=y +# CONFIG_PSCAN is not set +CONFIG_FEATURE_FANCY_PING=y +CONFIG_ROUTE=y +# CONFIG_SLATTACH is not set +CONFIG_TELNET=y +# CONFIG_FEATURE_TELNET_TTYPE is not set +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_APP_UDHCPD=y +# CONFIG_APP_DHCPRELAY is not set +CONFIG_APP_DUMPLEASES=y +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_APP_UDHCPC=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_FEATURE_RFC3397 is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_KILLALL5 is not set +# CONFIG_NMETER is not set +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +# CONFIG_FEATURE_TOP_DECIMALS is not set +CONFIG_UPTIME=y +CONFIG_WATCH=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +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 +CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_CTTYHACK is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_SV is not set +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set + +# +# ipsvd utilities +# +# CONFIG_TCPSVD is not set +# CONFIG_UDPSVD is not set diff --git a/packages/busybox/busybox-1.7.2/defconfig b/packages/busybox/busybox-1.7.2/defconfig deleted file mode 100644 index 19cfafab2c..0000000000 --- a/packages/busybox/busybox-1.7.2/defconfig +++ /dev/null @@ -1,753 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.7.2 -# Fri Oct 12 19:00:27 2007 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_NITPICK is not set -# CONFIG_DESKTOP is not set -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set -CONFIG_FEATURE_COMPRESS_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -CONFIG_LOCALE_SUPPORT=y -CONFIG_GETOPT_LONG=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_PIDFILE=y -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_BUILD_AT_ONCE=y - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -# CONFIG_INCLUDE_SUSv2 is not set - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -# CONFIG_FEATURE_EDITING_FANCY_KEYS is not set -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -CONFIG_FEATURE_EDITING_SAVEHISTORY=y -CONFIG_FEATURE_TAB_COMPLETION=y -CONFIG_FEATURE_USERNAME_COMPLETION=y -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y - -# -# Applets -# - -# -# Archival Utilities -# -CONFIG_AR=y -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y -CONFIG_CPIO=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_FEATURE_RPM_BZ2 is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -# CONFIG_FEATURE_TAR_LZMA is not set -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y -# CONFIG_FEATURE_DATE_ISOFMT is not set -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -CONFIG_FALSE=y -# CONFIG_FOLD is not set -CONFIG_HEAD=y -# CONFIG_FEATURE_FANCY_HEAD is not set -# CONFIG_HOSTID is not set -CONFIG_ID=y -# CONFIG_INSTALL is not set -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -# CONFIG_FEATURE_MV_LONG_OPTIONS is not set -# CONFIG_NICE is not set -CONFIG_NOHUP=y -CONFIG_OD=y -# CONFIG_PRINTENV is not set -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -CONFIG_STTY=y -# CONFIG_SUM is not set -CONFIG_SYNC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TEST=y -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -# CONFIG_FEATURE_TR_EQUIV is not set -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_UNIQ=y -CONFIG_USLEEP=y -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -CONFIG_WC=y -# CONFIG_FEATURE_WC_LARGE is not set -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -CONFIG_SETCONSOLE=y -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -CONFIG_RUN_PARTS=y -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -# CONFIG_CMP is not set -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_BINARY=y -CONFIG_FEATURE_DIFF_DIR=y -# CONFIG_FEATURE_DIFF_MINIMAL is not set -# CONFIG_ED is not set -CONFIG_PATCH=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=1024 -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -# CONFIG_FEATURE_VI_DOT_CMD is not set -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -# CONFIG_FEATURE_FIND_INUM is not set -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_DEBUG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -# CONFIG_HALT is not set -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_ADDUSER is not set -# CONFIG_DELUSER is not set -# CONFIG_GETTY is not set -CONFIG_FEATURE_UTMP=y -# CONFIG_FEATURE_WTMP is not set -# CONFIG_LOGIN is not set -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -CONFIG_CHATTR=y -CONFIG_FSCK=y -# CONFIG_LSATTR is not set - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_RMMOD=y -CONFIG_LSMOD=y -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y -CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -# CONFIG_FEATURE_2_4_MODULES is not set -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -CONFIG_FSCK_MINIX=y -CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# -CONFIG_FEATURE_MINIX2=y -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -CONFIG_MKSWAP=y -# CONFIG_FEATURE_MKSWAP_V0 is not set -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_NFS=y -# CONFIG_FEATURE_MOUNT_CIFS is not set -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -# CONFIG_READPROFILE is not set -# CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -# CONFIG_FEATURE_UMOUNT_ALL is not set - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -# CONFIG_CRONTAB is not set -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_EJECT is not set -# CONFIG_LAST is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_FLAGCS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -# CONFIG_SETSID is not set -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -CONFIG_TIME=y -# CONFIG_TTYSIZE is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -CONFIG_FEATURE_IFCONFIG_HW=y -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -CONFIG_IFUPDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -# CONFIG_FEATURE_IP_RULE is not set -# CONFIG_FEATURE_IP_SHORT_FORMS is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPRULE is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -CONFIG_NC=y -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_PING6=y -# CONFIG_PSCAN is not set -CONFIG_FEATURE_FANCY_PING=y -CONFIG_ROUTE=y -# CONFIG_SLATTACH is not set -CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -CONFIG_TFTP=y -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_DEBUG_TFTP is not set -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -CONFIG_APP_UDHCPD=y -# CONFIG_APP_DHCPRELAY is not set -CONFIG_APP_DUMPLEASES=y -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_APP_UDHCPC=y -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_FEATURE_RFC3397 is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -# CONFIG_ZCIP is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set -CONFIG_PIDOF=y -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -# CONFIG_FEATURE_TOP_DECIMALS is not set -CONFIG_UPTIME=y -CONFIG_WATCH=y - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -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_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -CONFIG_ASH_GETOPTS=y -# CONFIG_ASH_BUILTIN_ECHO is not set -CONFIG_ASH_BUILTIN_TEST=y -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -CONFIG_ASH_EXPAND_PRMT=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_CTTYHACK is not set - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_SV is not set -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set - -# -# ipsvd utilities -# -# CONFIG_TCPSVD is not set -# CONFIG_UDPSVD 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..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" -- cgit v1.2.3 From c549aa4d57104a78bd6756ab426b89267567bae6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 22 Nov 2007 18:49:28 +0000 Subject: linux-rp: Depends on bc during buildtime for collie. * Don't bother to create bc-natibe though, just add it to global ASSUME_PROVIDED list. --- packages/linux/linux-rp.inc | 1 + packages/linux/linux-rp_2.6.21.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') 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" -- cgit v1.2.3 From f49bb749b59a2a7bfc9105866019133831bed05c Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Thu, 22 Nov 2007 20:16:37 +0000 Subject: slugos-packages: add cryptsetup --- packages/meta/slugos-packages.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') 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 \ -- cgit v1.2.3 From 784b02a8a42d05edc46cbb4a3971cd08209c2d75 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 22 Nov 2007 20:48:03 +0000 Subject: cacao-cldc: fix path to cldc1.1.jar * path is now /usr/share/java for cldc1.1.jar * cosmetic change for cacao-cldc in package area * bump PR to 1 --- packages/cacao/cacao-cldc_0.98.bb | 8 ++++---- packages/cacao/cacao.inc | 1 + packages/cacao/cacaoh-cldc-native_0.98.bb | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/cacao/cacao-cldc_0.98.bb b/packages/cacao/cacao-cldc_0.98.bb index f7797206de..7076dd45d1 100644 --- a/packages/cacao/cacao-cldc_0.98.bb +++ b/packages/cacao/cacao-cldc_0.98.bb @@ -13,13 +13,13 @@ DEPENDS = "cacaoh-cldc-native ecj-native classpath-minimal-native virtual/cldc-a RDEPENDS = "virtual/cldc-api-1.1" 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}/ -- cgit v1.2.3 From ab2a176f3ccdfa64fb3b72106a2ecf18714b3a78 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 22 Nov 2007 20:53:35 +0000 Subject: midpath-cldc: rproviding virtual/cldc-api-1.1 * set in midpath-cldc: RPROVIDES = "virtual/cldc-api-1.1" so we are in sync with cacao-cldc * bump PR to 1 --- packages/midpath/midpath-cldc_0.1.bb | 1 + packages/midpath/midpath.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') 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.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" -- cgit v1.2.3 From 7d0c29858626d825d90a3e97ab97d1d89ce8695b Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 22 Nov 2007 20:59:39 +0000 Subject: midpath: cosmetic buildfixes * remove unnecessary build directory in a couple of .bb * no need to bump the PR --- packages/midpath/midpath-alsa_0.1.bb | 4 ---- packages/midpath/midpath-cldc-sdl_0.1.bb | 2 -- packages/midpath/midpath-cldc-x11_0.1.bb | 2 -- packages/midpath/midpath-gtk_0.1.bb | 2 -- packages/midpath/midpath-qt3x11_0.1.bb | 2 -- packages/midpath/midpath-qte_0.1.bb | 2 -- 6 files changed, 14 deletions(-) (limited to 'packages') 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-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-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 -- cgit v1.2.3 From 4c0d2d3099ec35f4a76f3c4cfe9b603b5b702906 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 22 Nov 2007 21:02:37 +0000 Subject: midpath-pulseaudio: new sound backend for midpath --- packages/midpath/midpath-pulseaudio_0.1.bb | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 packages/midpath/midpath-pulseaudio_0.1.bb (limited to 'packages') 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" -- cgit v1.2.3 From 2f0728d421371638542518906a4ab639198790dc Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 22 Nov 2007 21:13:50 +0000 Subject: cacao-cldc: fix RDEPENDS for libltdl * cacao-cldc needs libltdl if executed --- packages/cacao/cacao-cldc_0.98.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/cacao/cacao-cldc_0.98.bb b/packages/cacao/cacao-cldc_0.98.bb index 7076dd45d1..0f6af678f5 100644 --- a/packages/cacao/cacao-cldc_0.98.bb +++ b/packages/cacao/cacao-cldc_0.98.bb @@ -10,7 +10,7 @@ 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_DATADIR}/classpath-minimal \ -- cgit v1.2.3 From e3795cd4b62eeb7d16679e15c4bc18cd59dc3108 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 22 Nov 2007 23:24:35 +0000 Subject: liboil: fix bug 3090 * liboil DEPENDS on "glib-2.0" * it is no uclibc bug * bump PR to 2 --- packages/liboil/liboil_0.3.11.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') 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" -- cgit v1.2.3 From 7b55212801daa04fb55d54e907232ecb33549290 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Fri, 23 Nov 2007 05:08:05 +0000 Subject: disapproval of revision 'bc1afd499eafe3cff3eb38a3d5766aaa0a823536' --- packages/mpfr/mpfr-native_2.3.0.bb | 4 ---- packages/mpfr/mpfr.inc | 6 ------ packages/mpfr/mpfr_2.1.1.bb | 10 ++++++---- packages/mpfr/mpfr_2.3.0.bb | 16 ---------------- packages/mpfr/mpfr_cvs.bb | 10 ++++++---- 5 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 packages/mpfr/mpfr-native_2.3.0.bb delete mode 100644 packages/mpfr/mpfr.inc delete mode 100644 packages/mpfr/mpfr_2.3.0.bb (limited to 'packages') diff --git a/packages/mpfr/mpfr-native_2.3.0.bb b/packages/mpfr/mpfr-native_2.3.0.bb deleted file mode 100644 index 01ba37c8bf..0000000000 --- a/packages/mpfr/mpfr-native_2.3.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require mpfr_${PV}.bb -inherit native -DEPENDS = "gmp-native" - diff --git a/packages/mpfr/mpfr.inc b/packages/mpfr/mpfr.inc deleted file mode 100644 index cf898b62b6..0000000000 --- a/packages/mpfr/mpfr.inc +++ /dev/null @@ -1,6 +0,0 @@ -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 6127e5dae9..10383b1caa 100644 --- a/packages/mpfr/mpfr_2.1.1.bb +++ b/packages/mpfr/mpfr_2.1.1.bb @@ -1,12 +1,14 @@ -require mpfr.inc - +DESCRIPTION = "A C library for multiple-precision floating-point computations with exact rounding" +LICENSE = "LGPL" +SECTION = "libs" DEPENDS = "gmp" - -PR = "r3" +PR = "r2" 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 deleted file mode 100644 index f9d3b44d0b..0000000000 --- a/packages/mpfr/mpfr_2.3.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -require mpfr.inc - -DEPENDS = "gmp" - -PR = "r0" - -SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2" -S = "${WORKDIR}/mpfr-${PV}" - -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_cvs.bb b/packages/mpfr/mpfr_cvs.bb index 14b762408c..fcea24633a 100644 --- a/packages/mpfr/mpfr_cvs.bb +++ b/packages/mpfr/mpfr_cvs.bb @@ -1,13 +1,15 @@ -require mpfr.inc - +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 = "r2" +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} \ -- cgit v1.2.3 From 16ba12f1815e1239d7d4d249eeebce947145b4bf Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Fri, 23 Nov 2007 05:17:05 +0000 Subject: gcc-package-cross.inc: link gfortran to g77 --- packages/gcc/gcc-package-cross.inc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'packages') diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index 0875d1ab86..49d59ba704 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 + ln -sf ${CROSS_DIR}/${TARGET_SYS}/bin/gfortran ${CROSS_DIR}/${TARGET_SYS}/bin/g77 } -- cgit v1.2.3 From fbd7ee9a3871795cb7db38d40755d85059330bfa Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Fri, 23 Nov 2007 07:42:32 +0000 Subject: gsl: bump to new stable 1.10 version. --- packages/gsl/gsl_1.10.bb | 21 +++++++++++++++++++++ packages/gsl/gsl_1.4.bb | 19 ------------------- 2 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 packages/gsl/gsl_1.10.bb delete mode 100644 packages/gsl/gsl_1.4.bb (limited to 'packages') diff --git a/packages/gsl/gsl_1.10.bb b/packages/gsl/gsl_1.10.bb new file mode 100644 index 0000000000..bd941bc7ae --- /dev/null +++ b/packages/gsl/gsl_1.10.bb @@ -0,0 +1,21 @@ +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" + +inherit autotools pkgconfig binconfig + +LEAD_SONAME = "libgsl.so" + +do_stage() { + oe_runmake DESTDIR=${S}/.install install + oe_libinstall -so -C cblas/.libs/ libgslcblas ${STAGING_LIBDIR} + oe_libinstall -so -C .libs/ libgsl ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/gsl + install -m 0644 .install${includedir}/gsl/* ${STAGING_INCDIR}/gsl +} diff --git a/packages/gsl/gsl_1.4.bb b/packages/gsl/gsl_1.4.bb deleted file mode 100644 index 5e6ea090e4..0000000000 --- a/packages/gsl/gsl_1.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "GNU Scientific Library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "${GNU_MIRROR}/gsl/gsl-${PV}.tar.gz" - -inherit autotools pkgconfig binconfig - -LEAD_SONAME = "libgsl.so" - -do_stage() { - oe_runmake DESTDIR=${S}/.install install - oe_libinstall -so -C cblas/.libs/ libgslcblas ${STAGING_LIBDIR} - oe_libinstall -so -C .libs/ libgsl ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/gsl - install -m 0644 .install${includedir}/gsl/* ${STAGING_INCDIR}/gsl -} -- cgit v1.2.3