diff options
42 files changed, 477 insertions, 170 deletions
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index aac4688c3a..619b0f4339 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -17,7 +17,7 @@ PREFERRED_VERSION_linux = "2.6.20" # We want udev support in the image udevdir = "/dev" -N2100_SUPPORT ?= "cpio uboot-utils udev" +N2100_SUPPORT ?= "cpio udev" BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" EXTRA_IMAGECMD_jffs2 += " --little-endian" diff --git a/packages/dtc/.mtn2git_empty b/packages/dtc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dtc/.mtn2git_empty diff --git a/packages/dtc/dtc-native_20070216.bb b/packages/dtc/dtc-native_20070216.bb new file mode 100644 index 0000000000..8d8cf517a0 --- /dev/null +++ b/packages/dtc/dtc-native_20070216.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "dtc tool" +SECTION = "bootloader" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "http://www.jdl.com/pub/software/dtc-${PV}.tgz" + +S = "${WORKDIR}/dtc" + +inherit autotools native + +do_stage() { + install -m 755 dtc ${STAGING_BINDIR}/dtc +} diff --git a/packages/dtc/dtc-native_git.bb b/packages/dtc/dtc-native_git.bb new file mode 100644 index 0000000000..9ef9292e92 --- /dev/null +++ b/packages/dtc/dtc-native_git.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "dtc tool" +SECTION = "bootloader" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git" + +S = "${WORKDIR}/git" + +inherit autotools native + +do_stage() { + install -m 755 dtc ${STAGING_BINDIR}/dtc +} diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc index 1deaf3d94a..82bf78db80 100644 --- a/packages/gcc/gcc-package.inc +++ b/packages/gcc/gcc-package.inc @@ -67,6 +67,12 @@ FILES_${PN}-doc = "${infodir} \ ${mandir} \ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README" +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_libgcc', 'libgcc1', d) + bb.build.exec_func('package_do_package', d) +} + do_install () { autotools_do_install diff --git a/packages/gd/gd_2.0.33.bb b/packages/gd/gd_2.0.33.bb index 78500bbcbd..7c1f7c3d19 100644 --- a/packages/gd/gd_2.0.33.bb +++ b/packages/gd/gd_2.0.33.bb @@ -2,7 +2,7 @@ SECTION = "libs" LICENSE = "GD" DESCRIPTION = "gd is a library used to create PNG, JPEG, or WBMP images." DEPENDS = "libpng jpeg zlib" -PR = "r0" +PR = "r1" SRC_URI = "http://www.boutell.com/gd/http/gd-${PV}.tar.gz" S = "${WORKDIR}/gd-${PV}" @@ -12,6 +12,8 @@ inherit autotools binconfig gettext EXTRA_OECONF += " --with-zlib=${STAGING_LIBDIR}/.. \ --with-png=${STAGING_LIBDIR}/.. \ --with-jpeg=${STAGING_LIBDIR}/.. \ + --without-freetype \ + --without-fontconfig \ --without-xpm \ --without-x" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 4cad10fd73..5783ab1fcf 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -40,7 +40,7 @@ FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen" FILES_nscd = "${sbindir}/nscd*" FILES_glibc-utils = "${bindir}/* ${sbindir}/*" FILES_glibc-gconv = "${libdir}/gconv/*" -FILES_${PN}-dbg += " ${libdir}/gconv/.debug" +FILES_${PN}-dbg += "${libexecdir}/getconf/.debug ${libdir}/gconv/.debug" FILES_catchsegv = "${bindir}/catchsegv" RDEPENDS_catchsegv = "libsegfault" FILES_glibc-pcprofile = "/lib/libpcprofile.so" diff --git a/packages/gpe-clock/gpe-clock.inc b/packages/gpe-clock/gpe-clock.inc new file mode 100644 index 0000000000..34f628dcea --- /dev/null +++ b/packages/gpe-clock/gpe-clock.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "GPE panel clock" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" +RDEPENDS = "gpe-announce atd" + +inherit gpe diff --git a/packages/gpe-clock/gpe-clock_0.14.bb b/packages/gpe-clock/gpe-clock_0.14.bb index 9dcb7a6fcb..8b888f5126 100644 --- a/packages/gpe-clock/gpe-clock_0.14.bb +++ b/packages/gpe-clock/gpe-clock_0.14.bb @@ -1,11 +1,5 @@ -inherit gpe +require gpe-clock.inc -DESCRIPTION = "GPE panel clock" -DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd" -RDEPENDS = "gpe-announce atd" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" PR = "r1" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ diff --git a/packages/gpe-clock/gpe-clock_0.20.bb b/packages/gpe-clock/gpe-clock_0.20.bb index 121db0c807..3ef23edcb2 100644 --- a/packages/gpe-clock/gpe-clock_0.20.bb +++ b/packages/gpe-clock/gpe-clock_0.20.bb @@ -1,10 +1,3 @@ -inherit gpe - -DESCRIPTION = "GPE panel clock" -DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" -RDEPENDS = "gpe-announce atd" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" +require gpe-clock.inc SRC_URI += "file://default-time-24hrs.patch;patch=1" diff --git a/packages/gpe-clock/gpe-clock_0.21.bb b/packages/gpe-clock/gpe-clock_0.21.bb index 51b001208b..de509fda40 100644 --- a/packages/gpe-clock/gpe-clock_0.21.bb +++ b/packages/gpe-clock/gpe-clock_0.21.bb @@ -1,9 +1 @@ -inherit gpe - -DESCRIPTION = "GPE panel clock" -DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" -RDEPENDS = "gpe-announce atd" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" - +require gpe-clock.inc diff --git a/packages/gpe-clock/gpe-clock_0.23.bb b/packages/gpe-clock/gpe-clock_0.23.bb index 51b001208b..de509fda40 100644 --- a/packages/gpe-clock/gpe-clock_0.23.bb +++ b/packages/gpe-clock/gpe-clock_0.23.bb @@ -1,9 +1 @@ -inherit gpe - -DESCRIPTION = "GPE panel clock" -DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" -RDEPENDS = "gpe-announce atd" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" - +require gpe-clock.inc diff --git a/packages/gpe-clock/gpe-clock_0.24.bb b/packages/gpe-clock/gpe-clock_0.24.bb index 51b001208b..de509fda40 100644 --- a/packages/gpe-clock/gpe-clock_0.24.bb +++ b/packages/gpe-clock/gpe-clock_0.24.bb @@ -1,9 +1 @@ -inherit gpe - -DESCRIPTION = "GPE panel clock" -DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" -RDEPENDS = "gpe-announce atd" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" - +require gpe-clock.inc diff --git a/packages/gpe-clock/gpe-clock_0.25.bb b/packages/gpe-clock/gpe-clock_0.25.bb index 51b001208b..de509fda40 100644 --- a/packages/gpe-clock/gpe-clock_0.25.bb +++ b/packages/gpe-clock/gpe-clock_0.25.bb @@ -1,9 +1 @@ -inherit gpe - -DESCRIPTION = "GPE panel clock" -DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch" -RDEPENDS = "gpe-announce atd" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" - +require gpe-clock.inc diff --git a/packages/gpe-nmf/gpe-nmf.inc b/packages/gpe-nmf/gpe-nmf.inc new file mode 100644 index 0000000000..d3b39abdcf --- /dev/null +++ b/packages/gpe-nmf/gpe-nmf.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "GPE audio player" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins" +RDEPENDS = "esd gst-plugins gst-plugin-audio gst-plugin-audioconvert gst-plugin-audiofile gst-plugin-esd gst-plugin-typefindfunctions gst-plugin-volume" +RRECOMMENDS = "gst-plugin-mad gst-plugin-tagedit" + +inherit gpe pkgconfig + + +PARALLEL_MAKE="" diff --git a/packages/gpe-nmf/gpe-nmf_0.17.bb b/packages/gpe-nmf/gpe-nmf_0.17.bb index bf45dc5d56..93fd043e63 100644 --- a/packages/gpe-nmf/gpe-nmf_0.17.bb +++ b/packages/gpe-nmf/gpe-nmf_0.17.bb @@ -1,9 +1,6 @@ -LICENSE = "GPL" -inherit gpe pkgconfig +require gpe-nmf.inc -DESCRIPTION = "GPE audio player" -DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins" -SECTION = "gpe" -PRIORITY = "optional" +RDEPENDS = "" +RRECOMMENDS = "" SRC_URI += "file://fix_makefiles.patch;patch=1" diff --git a/packages/gpe-nmf/gpe-nmf_0.19.bb b/packages/gpe-nmf/gpe-nmf_0.19.bb index 9f87e6abdc..6ee24032e0 100644 --- a/packages/gpe-nmf/gpe-nmf_0.19.bb +++ b/packages/gpe-nmf/gpe-nmf_0.19.bb @@ -1,20 +1,3 @@ -LICENSE = "GPL" -inherit gpe pkgconfig +require gpe-nmf.inc -DESCRIPTION = "GPE audio player" -DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins" -RDEPENDS = "esd \ - gst-plugins \ - gst-plugin-audio \ - gst-plugin-audioconvert \ - gst-plugin-audiofile \ - gst-plugin-esd \ - gst-plugin-typefindfunctions \ - gst-plugin-volume" -RRECOMMENDS = "gst-plugin-mad \ - gst-plugin-tagedit" -SECTION = "gpe" -PRIORITY = "optional" PR = "r4" - -PARALLEL_MAKE="" diff --git a/packages/gpe-nmf/gpe-nmf_0.20.bb b/packages/gpe-nmf/gpe-nmf_0.20.bb index 875c38f950..bfbb7a487c 100644 --- a/packages/gpe-nmf/gpe-nmf_0.20.bb +++ b/packages/gpe-nmf/gpe-nmf_0.20.bb @@ -1,21 +1,4 @@ -LICENSE = "GPL" -inherit gpe pkgconfig +require gpe-nmf.inc -DESCRIPTION = "GPE audio player" -DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins" -RDEPENDS = "esd \ - gst-plugins \ - gst-plugin-audio \ - gst-plugin-audioconvert \ - gst-plugin-audiofile \ - gst-plugin-esd \ - gst-plugin-typefindfunctions \ - gst-plugin-volume" -RRECOMMENDS = "gst-plugin-mad \ - gst-plugin-tagedit \ - gst-plugin-tcp" -SECTION = "gpe" -PRIORITY = "optional" +RRECOMMENDS += "gst-plugin-tcp" PR = "r1" - -PARALLEL_MAKE="" diff --git a/packages/gpe-nmf/gpe-nmf_0.21.bb b/packages/gpe-nmf/gpe-nmf_0.21.bb index 4501cdf55d..f1292b93e2 100644 --- a/packages/gpe-nmf/gpe-nmf_0.21.bb +++ b/packages/gpe-nmf/gpe-nmf_0.21.bb @@ -1,21 +1,3 @@ -LICENSE = "GPL" -inherit gpe pkgconfig +require gpe-nmf.inc -DESCRIPTION = "GPE audio player" -DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins" -RDEPENDS = "esd \ - gst-plugins \ - gst-plugin-audio \ - gst-plugin-audioconvert \ - gst-plugin-audiofile \ - gst-plugin-esd \ - gst-plugin-typefindfunctions \ - gst-plugin-volume" -RRECOMMENDS = "gst-plugin-mad \ - gst-plugin-tagedit \ - gst-plugin-tcp" -SECTION = "gpe" -PRIORITY = "optional" -PR = "r0" - -PARALLEL_MAKE="" +RRECOMMENDS += "gst-plugin-tcp" diff --git a/packages/gpe-nmf/gpe-nmf_0.22.bb b/packages/gpe-nmf/gpe-nmf_0.22.bb index c4b2ae7c2c..8b70d83c6b 100644 --- a/packages/gpe-nmf/gpe-nmf_0.22.bb +++ b/packages/gpe-nmf/gpe-nmf_0.22.bb @@ -1,31 +1,12 @@ -LICENSE = "GPL" -inherit gpe pkgconfig +require gpe-nmf.inc -DESCRIPTION = "GPE audio player" -DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins" -RDEPENDS = "esd \ - gst-plugins \ - gst-plugin-audio \ - gst-plugin-audioconvert \ - gst-plugin-audiofile \ - gst-plugin-esd \ - gst-plugin-typefindfunctions \ - gst-plugin-decodebin \ - gst-plugin-volume" -RRECOMMENDS = "gst-plugin-mad \ - gst-plugin-tagedit \ - gst-plugin-ivorbis \ - gst-plugin-tcp" +RDEPENDS += "gst-plugin-decodebin" +RRECOMMENDS += "gst-plugin-ivorbis gst-plugin-tcp" +PR = "r2" SRC_URI += " file://playlist-segfault.patch;patch=1;pnum=0 \ file://fix-includepath.patch;patch=1" -SECTION = "gpe" -PRIORITY = "optional" -PR = "r2" - -PARALLEL_MAKE="" - do_compile() { oe_runmake PREFIX=${prefix} GST_VERSION="0.8" } diff --git a/packages/hfsplusutils/.mtn2git_empty b/packages/hfsplusutils/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hfsplusutils/.mtn2git_empty diff --git a/packages/hfsplusutils/hfsplusutils-1.0.4-4/.mtn2git_empty b/packages/hfsplusutils/hfsplusutils-1.0.4-4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hfsplusutils/hfsplusutils-1.0.4-4/.mtn2git_empty diff --git a/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-errno.patch b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-errno.patch new file mode 100644 index 0000000000..c9caeb4208 --- /dev/null +++ b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-errno.patch @@ -0,0 +1,19 @@ +diff -ruN hfsplus.orig/src/hpmkdir.c hfsplus-1.0.4/src/hpmkdir.c +--- hfsplus.orig/src/hpmkdir.c 2003-03-30 20:09:59.000000000 +0200 ++++ hfsplus-1.0.4/src/hpmkdir.c 2003-03-30 20:11:15.000000000 +0200 +@@ -46,8 +46,9 @@ + # include <string.h> + # include <time.h> + # include <ctype.h> +-# include <errno.h> + */ ++# include <errno.h> ++ + # include <stdio.h> + # include <stdlib.h> + +@@ -164,3 +165,4 @@ + hfsputil_perrorp(argv0); + return -1; + } ++ diff --git a/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-gcc4.patch b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-gcc4.patch new file mode 100644 index 0000000000..04724440dd --- /dev/null +++ b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-gcc4.patch @@ -0,0 +1,132 @@ +--- hfsplus-1.0.4/libhfsp/src/btree.c~ 2002-03-05 19:50:28.000000000 +0000 ++++ hfsplus-1.0.4/libhfsp/src/btree.c 2005-04-30 12:48:48.000000000 +0100 +@@ -393,7 +393,7 @@ static int btree_init(btree* bt, volume* + { + p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode, + HFSP_EXTENT_DATA, bt->cnid); +- ((char*) p) += HEADER_RESERVEDOFFSET; // skip header ++ p += HEADER_RESERVEDOFFSET; // skip header + } + + bt->alloc_bits = malloc(alloc_size); +--- hfsplus-1.0.4/libhfsp/src/swab.h~ 2002-03-05 19:50:29.000000000 +0000 ++++ hfsplus-1.0.4/libhfsp/src/swab.h 2005-04-30 12:48:05.000000000 +0100 +@@ -36,28 +36,28 @@ + + #define bswabU16(val) bswap_16(val) + +-#define bswabU16_inc(ptr) bswap_16(*((UInt16*) (ptr))++) +-#define bswabU32_inc(ptr) bswap_32(*((UInt32*) (ptr))++) +-#define bswabU64_inc(ptr) bswap_64(*((UInt64*) (ptr))++) +- +-#define bstoreU16_inc(ptr, val) (*((UInt16*) (ptr))++) = bswap_16(val) +-#define bstoreU32_inc(ptr, val) (*((UInt32*) (ptr))++) = bswap_32(val) +-#define bstoreU64_inc(ptr, val) (*((UInt64*) (ptr))++) = bswap_64(val) ++#define bswabU16_inc(ptr) bswap_16(*(*((UInt16**) (void *)(&ptr)))++) ++#define bswabU32_inc(ptr) bswap_32(*(*((UInt32**) (void *)(&ptr)))++) ++#define bswabU64_inc(ptr) bswap_64(*(*((UInt64**) (void *)(&ptr)))++) ++ ++#define bstoreU16_inc(ptr, val) (*(*((UInt16**) (void *)(&ptr)))++) = bswap_16(val) ++#define bstoreU32_inc(ptr, val) (*(*((UInt32**) (void *)(&ptr)))++) = bswap_32(val) ++#define bstoreU64_inc(ptr, val) (*(*((UInt64**) (void *)(&ptr)))++) = bswap_64(val) + + #else // BYTE_ORDER == BIG_ENDIAN + + #define bswabU16(val) val + +-#define bswabU16_inc(ptr) (*((UInt16*) (ptr))++) +-#define bswabU32_inc(ptr) (*((UInt32*) (ptr))++) +-#define bswabU64_inc(ptr) (*((UInt64*) (ptr))++) +- +-#define bstoreU16_inc(ptr, val) (*((UInt16*) (ptr))++) = val +-#define bstoreU32_inc(ptr, val) (*((UInt32*) (ptr))++) = val +-#define bstoreU64_inc(ptr, val) (*((UInt64*) (ptr))++) = val ++#define bswabU16_inc(ptr) (*(*((UInt16**) (void *)(&ptr)))++) ++#define bswabU32_inc(ptr) (*(*((UInt32**) (void *)(&ptr)))++) ++#define bswabU64_inc(ptr) (*(*((UInt64**) (void *)(&ptr)))++) ++ ++#define bstoreU16_inc(ptr, val) (*(*((UInt16**) (void *)(&ptr)))++) = val ++#define bstoreU32_inc(ptr, val) (*(*((UInt32**) (void *)(&ptr)))++) = val ++#define bstoreU64_inc(ptr, val) (*(*((UInt64**) (void *)(&ptr)))++) = val + + #endif + + /* for the sake of compleetness and readability */ +-#define bswabU8_inc(ptr) (*((UInt8*) (ptr))++) +-#define bstoreU8_inc(ptr,val) (*((UInt8*) (ptr))++) = val ++#define bswabU8_inc(ptr) (*(*((UInt8**) (void *)(&ptr)))++) ++#define bstoreU8_inc(ptr,val) (*(*((UInt8**) (void *)(&ptr)))++) = val +--- hfsplus-1.0.4/libhfsp/src/btreecheck.c~ 2002-03-05 19:50:29.000000000 +0000 ++++ hfsplus-1.0.4/libhfsp/src/btreecheck.c 2005-04-30 12:49:22.000000000 +0100 +@@ -264,7 +264,7 @@ static int fscheck_btree_init(btree* bt, + { + p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode, + HFSP_EXTENT_DATA, bt->cnid); +- ((char*) p) += HEADER_RESERVEDOFFSET; // skip header ++ p += HEADER_RESERVEDOFFSET; // skip header + } + + bt->alloc_bits = malloc(alloc_size); +--- hfsplus-1.0.4/libhfsp/src/fscheck.c~ 2002-03-25 15:48:37.000000000 +0000 ++++ hfsplus-1.0.4/libhfsp/src/fscheck.c 2005-04-30 12:50:26.000000000 +0100 +@@ -230,7 +230,7 @@ static int fscheck_volume_readbuf(volume + vh->write_count = bswabU32_inc(p); + vh->encodings_bmp = bswabU64_inc(p); + memcpy(vh->finder_info, p, 32); +- ((char*) p) += 32; // So finderinfo must be swapped later, *** ++ p += 32; // So finderinfo must be swapped later, *** + p = volume_readfork(p, &vh->alloc_file ); + p = volume_readfork(p, &vh->ext_file ); + p = volume_readfork(p, &vh->cat_file ); +@@ -277,12 +277,12 @@ static int fscheck_read_wrapper(volume * + printf("Volume is wrapped in HFS volume " + " (use hfsck to check this)\n"); + +- ((char*) p) += 0x12; /* skip unneded HFS vol fields */ ++ p += 0x12; /* skip unneded HFS vol fields */ + drAlBlkSiz = bswabU32_inc(p); /* offset 0x14 */ +- ((char*) p) += 0x4; /* skip unneded HFS vol fields */ ++ p += 0x4; /* skip unneded HFS vol fields */ + drAlBlSt = bswabU16_inc(p); /* offset 0x1C */ + +- ((char*) p) += 0x5E; /* skip unneded HFS vol fields */ ++ p += 0x5E; /* skip unneded HFS vol fields */ + signature = bswabU16_inc(p); /* offset 0x7C, drEmbedSigWord */ + if (signature != HFSP_VOLHEAD_SIG) + HFSP_ERROR(-1, "This looks like a normal HFS volume"); +--- hfsplus-1.0.4/libhfsp/src/volume.c~ 2002-03-26 18:00:29.000000000 +0000 ++++ hfsplus-1.0.4/libhfsp/src/volume.c 2005-04-30 12:51:41.000000000 +0100 +@@ -345,7 +345,7 @@ static int volume_readbuf(hfsp_vh* vh, v + vh->write_count = bswabU32_inc(p); + vh->encodings_bmp = bswabU64_inc(p); + memcpy(vh->finder_info, p, 32); +- ((char*) p) += 32; // finderinfo is not used by now ++ p += 32; // finderinfo is not used by now + p = volume_readfork(p, &vh->alloc_file ); + p = volume_readfork(p, &vh->ext_file ); + p = volume_readfork(p, &vh->cat_file ); +@@ -381,7 +381,7 @@ static int volume_writebuf(hfsp_vh* vh, + bstoreU32_inc(p, vh->write_count ); + bstoreU64_inc(p, vh->encodings_bmp ); + memcpy(p, vh->finder_info, 32); +- ((char*) p) += 32; // finderinfo is not used by now ++ p += 32; // finderinfo is not used by now + p = volume_writefork(p, &vh->alloc_file ); + p = volume_writefork(p, &vh->ext_file ); + p = volume_writefork(p, &vh->cat_file ); +@@ -417,12 +417,12 @@ static int volume_read_wrapper(volume * + + UInt16 embeds, embedl; /* Start/lenght of embedded area in blocks */ + +- ((char*) p) += 0x12; /* skip unneeded HFS vol fields */ ++ p += 0x12; /* skip unneeded HFS vol fields */ + drAlBlkSiz = bswabU32_inc(p); /* offset 0x14 */ +- ((char*) p) += 0x4; /* skip unneeded HFS vol fields */ ++ p += 0x4; /* skip unneeded HFS vol fields */ + drAlBlSt = bswabU16_inc(p); /* offset 0x1C */ + +- ((char*) p) += 0x5E; /* skip unneeded HFS vol fields */ ++ p += 0x5E; /* skip unneeded HFS vol fields */ + signature = bswabU16_inc(p); /* offset 0x7C, drEmbedSigWord */ + if (signature != HFSP_VOLHEAD_SIG) + HFSP_ERROR(-1, "This looks like a normal HFS volume"); diff --git a/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-glob.patch b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-glob.patch new file mode 100644 index 0000000000..5b0333e642 --- /dev/null +++ b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-glob.patch @@ -0,0 +1,12 @@ +--- hfsplus-1.0.4/src/glob.c.orig 2002-10-09 08:02:31.000000000 -0500 ++++ hfsplus-1.0.4/src/glob.c 2002-10-09 08:02:46.000000000 -0500 +@@ -48,7 +48,7 @@ + + switch (*pat) + { +- case NULL: // pattern at end ++ case '\0': // pattern at end + return (!*str); // String at end ? + + case '*': // match all + diff --git a/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-string.patch b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-string.patch new file mode 100644 index 0000000000..5eaf32806a --- /dev/null +++ b/packages/hfsplusutils/hfsplusutils-1.0.4-4/hfsplusutils-1.0.4-string.patch @@ -0,0 +1,11 @@ +--- hfsplus-1.0.4/libhfsp/src/unicode.c.bak 2007-01-08 17:14:44.000000000 -0500 ++++ hfsplus-1.0.4/libhfsp/src/unicode.c 2007-01-08 17:14:52.000000000 -0500 +@@ -16,7 +16,7 @@ + #include <stdlib.h> + #include <endian.h> + #include <byteswap.h> +-#include <linux/string.h> ++#include <string.h> + + #define __USE_GNU + /* need wcsrtomb */ diff --git a/packages/hfsplusutils/hfsplusutils_1.0.4-4.bb b/packages/hfsplusutils/hfsplusutils_1.0.4-4.bb new file mode 100644 index 0000000000..43037573f4 --- /dev/null +++ b/packages/hfsplusutils/hfsplusutils_1.0.4-4.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "HFS plus file system utilities" +SECTION = "base" +LICENSE = "GPL" +PR = "r1" + +S="${WORKDIR}/${P}" + +inherit kernel-arch autotools pkgconfig + +DEPENDS = " rpm2cpio-native" + +SRC_URI = "http://penguinppc.org/historical/hfsplus/hfsplusutils-1.0.4-4.src.rpm \ + file://hfsplusutils-1.0.4-errno.patch;patch=1 \ + file://hfsplusutils-1.0.4-gcc4.patch;patch=1 \ + file://hfsplusutils-1.0.4-glob.patch;patch=1 \ + file://hfsplusutils-1.0.4-string.patch;patch=1 \ + " + +do_unpack() { + if ! test -f hfsplus.tz2 ; then + rpm2cpio.pl ${DL_DIR}/${P}.src.rpm | cpio -i --make-directories + bunzip2 hfsplus.tz2 + tar -xf hfsplus.tz2.out + mv hfsplus ${P} + fi +} diff --git a/packages/hfsutils/hfsutils_3.2.6.bb b/packages/hfsutils/hfsutils_3.2.6.bb index 981c79351b..5292ac386c 100644 --- a/packages/hfsutils/hfsutils_3.2.6.bb +++ b/packages/hfsutils/hfsutils_3.2.6.bb @@ -1,7 +1,7 @@ DESCRIPTION = "HFS file system utilities" SECTION = "base" LICENSE = "GPL" -PR = "r1" +PR = "r2" inherit autotools pkgconfig @@ -20,22 +20,13 @@ do_compile () { } do_install () { - install -d ${D}/usr/bin - install -m 755 hfsutil ${D}/usr/bin/hfsutil - install -m 755 hfsck/hfsck ${D}/usr/bin/hfsck + install -d ${D}/${bindir} + install -m 755 hfsutil ${D}/${bindir}/hfsutil + install -m 755 hfsck/hfsck ${D}/${bindir}/hfsck - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hattrib - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hcd - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hcopy - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hdel - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hdir - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hformat - ln -sf /usr/bin/hfsutil ${D}/usr/bin/his - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hmkdir - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hmount - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hpwd - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hrename - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hrmdir - ln -sf /usr/bin/hfsutil ${D}/usr/bin/humount - ln -sf /usr/bin/hfsutil ${D}/usr/bin/hvol + for util in hattrib hcd hcopy hdel hdir hformat \ + his hmkdir hmount hpwd hrename hrmdir \ + humount hvol; do + ln -sf hfsutil ${D}/${bindir}/${util} + done } diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb index f236bbfec4..23059d9bca 100644 --- a/packages/images/foonas-image.bb +++ b/packages/images/foonas-image.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" PR = "r0" DEPENDS = "${MACHINE_TASK_PROVIDER}" -EXTRA_IMAGECMD_turbostation = "--bit-endian" +EXTRA_IMAGECMD_turbostation = "--big-endian" EXTRA_IMAGECMD_n2100 = "--little-endian" EXTRA_IMAGECMD_jffs2 += " --eraseblock=${ERASEBLOCK_SIZE} -D ${SLUGOS_DEVICE_TABLE}" IMAGE_LINGUAS = "" @@ -36,7 +36,8 @@ PACK_IMAGE_DEPENDS = "" IMAGE_TOOLS = "" #EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}" -FOONAS_SUPPORT += "diffutils cpio findutils uboot-utils udev" +FOONAS_SUPPORT += "diffutils cpio findutils udev" +FOONAS_SUPPORT_turbostation += "uboot-utils" # this gets /lib/modules made.... FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb index 4ddf2c52dd..38762069cc 100644 --- a/packages/linux/ixp4xx-kernel_2.6.20.bb +++ b/packages/linux/ixp4xx-kernel_2.6.20.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "772" +IXP4XX_KERNEL_SVN_REV = "774" # # The directory containing the patches to be applied is # specified below diff --git a/packages/linux/linux_2.6.20.bb b/packages/linux/linux_2.6.20.bb index d6a093c05f..c4017f4a2b 100644 --- a/packages/linux/linux_2.6.20.bb +++ b/packages/linux/linux_2.6.20.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Linux Kernel" SECTION = "kernel" LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://defconfig" @@ -29,5 +29,6 @@ do_configure_prepend() { } do_install_append_n2100() { + install -d ${DEPLOY_DIR_IMAGE} install -m 0644 ${S}/arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} }
\ No newline at end of file diff --git a/packages/meta/foonas-packages.bb b/packages/meta/foonas-packages.bb index f0e5eb6408..adee8f5c55 100644 --- a/packages/meta/foonas-packages.bb +++ b/packages/meta/foonas-packages.bb @@ -64,7 +64,6 @@ FOONAS_PACKAGES = "\ findutils \ flex \ flite \ - gallery \ gawk \ gcc \ gdbm \ diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index f1801a1c7c..784d765cf7 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -156,7 +156,6 @@ SLUGOS_PACKAGES = "\ strace \ streamripper \ sysfsutils \ - syslog-ng \ tar \ task-mokogateway-everything \ thttpd \ @@ -192,6 +191,7 @@ SLUGOS_BROKEN_PACKAGES = "\ puppy \ pvrusb2-mci \ qc-usb-messenger \ + syslog-ng \ sane-backends \ unionfs-modules \ unionfs-utils \ diff --git a/packages/radvd/files/.mtn2git_empty b/packages/radvd/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/radvd/files/.mtn2git_empty diff --git a/packages/radvd/files/radvd.conf.empty b/packages/radvd/files/radvd.conf.empty new file mode 100644 index 0000000000..c006f86313 --- /dev/null +++ b/packages/radvd/files/radvd.conf.empty @@ -0,0 +1,18 @@ +# NOTE: there is no such thing as a working "by-default" configuration file. +# At least the prefix needs to be specified. Please consult the radvd.conf(5) +# man page and/or /usr/share/doc/radvd-*/radvd.conf.example for help. +# +# +#interface eth0 +#{ +# AdvSendAdvert on; +# MinRtrAdvInterval 30; +# MaxRtrAdvInterval 100; +# prefix 2001:db8:1:0::/64 +# { +# AdvOnLink on; +# AdvAutonomous on; +# AdvRouterAddr off; +# }; +# +#}; diff --git a/packages/radvd/files/radvd.init b/packages/radvd/files/radvd.init new file mode 100755 index 0000000000..5415230285 --- /dev/null +++ b/packages/radvd/files/radvd.init @@ -0,0 +1,115 @@ +#! /bin/sh + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/radvd +NAME=radvd +DESC=radvd +CONFIG=/etc/radvd.conf +SAVED_SETTINGS=/var/run/radvd/saved-settings +PIDFILE=/var/run/radvd/radvd.pid +OPTIONS="-u radvd -p $PIDFILE" + +test -x $DAEMON || exit 0 + +set -e + +# Check for IPv6 support in kernel +if test \! -e /proc/sys/net/ipv6; then + echo "IPv6 support must be enabled in the kernel for $DESC to work." + exit +fi + +save_settings() +{ + local file=$1 + + rm -f $file + for if_conf in /proc/sys/net/ipv6/conf/*; do + echo -e "$if_conf/forwarding\t `cat $if_conf/forwarding`" >> $file + done + return 0 +} + +restore_settings() +{ + file=$1 + + if [ ! -f $file ]; then + echo "$0: warning: cannot restore settings" + return + fi + + ( + while read f value; do + if [ -w $f ]; then + echo $value > $f + fi + done + ) < $file +} + +chkconfig() { + if [ ! -e $CONFIG -o ! -s $CONFIG ]; then + echo "" + echo "* $CONFIG does not exist or is empty." + echo "* See /usr/share/doc/radvd/examples/simple-radvd.conf for a simple" + echo "* configuration suitable for most systems, and radvd.conf(5)" + echo "* for configuration file syntax. radvd will *not* be started." + exit 0 + fi +} + +case "$1" in + start) + echo -n "Starting $DESC: " + chkconfig + save_settings $SAVED_SETTINGS + + # We must enable IPv6 forwarding for radvd to work + echo 1 > /proc/sys/net/ipv6/conf/all/forwarding + + # Check for stale pidfile; radvd won't start if one is lying around + if [ -f $PIDFILE ] && ! ps `cat $PIDFILE` > /dev/null; then + rm -f $PIDFILE + fi + if ! start-stop-daemon --oknodo --start --pidfile $PIDFILE \ + --exec $DAEMON -- $OPTIONS; then + echo "failed." && exit 1 + fi + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --oknodo --stop --pidfile $PIDFILE \ + --exec $DAEMON + restore_settings $SAVED_SETTINGS + rm -f $SAVED_SETTINGS + echo "$NAME." + ;; + reload|force-reload) + echo "Reloading $DESC configuration files." + start-stop-daemon --stop --signal HUP --quiet --pidfile \ + $PIDFILE --exec $DAEMON + ;; + restart) + chkconfig + echo -n "Restarting $DESC: " + if ! start-stop-daemon --stop --quiet --pidfile \ + $PIDFILE --exec $DAEMON; then + # stop failed, so we were not running + save_settings $SAVED_SETTINGS + echo 1 > /proc/sys/net/ipv6/conf/all/forwarding + fi + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + $PIDFILE --exec $DAEMON -- $OPTIONS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/radvd/files/volatiles.03_radvd b/packages/radvd/files/volatiles.03_radvd new file mode 100644 index 0000000000..89256a40e4 --- /dev/null +++ b/packages/radvd/files/volatiles.03_radvd @@ -0,0 +1,2 @@ +# <type> <owner> <group> <mode> <path> <linksource> +d radvd root 0755 /var/run/radvd none diff --git a/packages/radvd/radvd.inc b/packages/radvd/radvd.inc index 745b37d35e..f73f8c0583 100644 --- a/packages/radvd/radvd.inc +++ b/packages/radvd/radvd.inc @@ -4,8 +4,38 @@ SECTION = "console/network" LICENSE = "BSD" DEPENDS = "flex-native" -SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz;md5sum=${MD5SUM}" +SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz;md5sum=${MD5SUM} \ + file://radvd.init \ + file://volatiles.03_radvd \ + file://radvd.conf.empty" S = "${WORKDIR}/radvd-${PV}" -inherit autotools +inherit autotools update-rc.d + +do_install_append () { + install -m 0755 -d ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/default/volatiles \ + ${D}${docdir}/radvd + # Install init script and volatiles + install -m 0755 ${WORKDIR}/radvd.init ${D}${sysconfdir}/init.d/radvd + install -m 0644 ${WORKDIR}/volatiles.03_radvd ${D}${sysconfdir}/default/volatiles/volatiles.03_radvd + # Initial configuration + # install -m 0644 ${WORKDIR}/radvd.conf.empty ${D}${sysconfdir}/radvd.conf + # Documentation + for i in ${WORKDIR}/radvd.conf.empty radvd.conf.example README; do \ + install -m 0644 $i ${D}${docdir}/radvd; \ + done +} + +#CONFFILES_${PN} = "${sysconfdir}/radvd.conf" + +INITSCRIPT_NAME = "radvd" +INITSCRIPT_PARAMS = "defaults 20 80" + +pkg_postinst_${PN} () { + grep -q radvd: /etc/passwd || \ + adduser --disabled-password --home=/var/run/radvd/ --system \ + --ingroup nogroup --no-create-home -g "IPv6 router advertisement daemon" radvd + /etc/init.d/populate-volatile.sh update +} diff --git a/packages/radvd/radvd_0.7.2.bb b/packages/radvd/radvd_0.7.2.bb index 6f22484b05..e22cc5e96b 100644 --- a/packages/radvd/radvd_0.7.2.bb +++ b/packages/radvd/radvd_0.7.2.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" SRC_URI_append += "file://automake.patch;patch=1 " diff --git a/packages/radvd/radvd_1.0.bb b/packages/radvd/radvd_1.0.bb index 87422a2df9..6d44ff2f94 100644 --- a/packages/radvd/radvd_1.0.bb +++ b/packages/radvd/radvd_1.0.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" require radvd.inc diff --git a/packages/xfsprogs/xfsprogs_2.8.16.bb b/packages/xfsprogs/xfsprogs_2.8.16.bb index 60cc6a2994..603b6cbb08 100644 --- a/packages/xfsprogs/xfsprogs_2.8.16.bb +++ b/packages/xfsprogs/xfsprogs_2.8.16.bb @@ -2,7 +2,8 @@ DESCRIPTION = "XFS Filesystem Utilities" HOMEPAGE = "http://oss.sgi.com/projects/xfs" LICENSE = "GPL" SECTION = "base" -PR = "r0" +PR = "r2" +DEPENDS = "e2fsprogs-libs" SRC_URI = "ftp://oss.sgi.com/projects/xfs/download/download/cmd_tars/xfsprogs_2.8.16-1.tar.gz" @@ -11,7 +12,7 @@ inherit autotools EXTRA_OECONF = "--enable-gettext=no" do_configure () { - export LIBTOOL="${STAGING_BINDIR}/${HOST_SYS}-libtool" + export LIBTOOL="${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool" export DEBUG="-DNDEBUG" oe_runconf } diff --git a/packages/xorg-lib/diet-x11/makekeys.diff b/packages/xorg-lib/diet-x11/makekeys.diff new file mode 100644 index 0000000000..cea08725ec --- /dev/null +++ b/packages/xorg-lib/diet-x11/makekeys.diff @@ -0,0 +1,12 @@ +diff -Nru libX11-X11R7.1-1.0.1.org/src/util/makekeys.c libX11-X11R7.1-1.0.1/src/util/makekeys.c +--- libX11-X11R7.1-1.0.1.org/src/util/makekeys.c 2007-03-08 14:34:34.000000000 +0100 ++++ libX11-X11R7.1-1.0.1/src/util/makekeys.c 2007-03-08 14:34:58.000000000 +0100 +@@ -49,7 +49,7 @@ + KeySym val; + } info[KTNUM]; + +-#define MIN_REHASH 10 ++#define MIN_REHASH 15 + #define MATCHES 10 + + char tab[KTNUM]; |