diff options
| -rw-r--r-- | conf/machine/spitz.conf | 2 | ||||
| -rw-r--r-- | packages/gnome/gconf-dbus_cvs.bb | 10 | ||||
| -rw-r--r-- | packages/psmisc/psmisc_21.8.bb | 42 | ||||
| -rw-r--r-- | packages/squashfs-tools/files/Makefile-2.2.patch | 21 | ||||
| -rw-r--r-- | packages/squashfs-tools/squashfs-tools-native_2.2r2.bb | 13 | ||||
| -rw-r--r-- | packages/squashfs-tools/squashfs-tools_2.2r2.bb | 23 |
6 files changed, 105 insertions, 6 deletions
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 79ce0c4193..9a53e8f1a9 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -13,7 +13,7 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += "" # Useful things for the built-in Harddisk BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs" -BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" +BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs" IMAGE_FSTYPES = "jffs2 tar.gz" diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb index a403fae24c..cf326d255a 100644 --- a/packages/gnome/gconf-dbus_cvs.bb +++ b/packages/gnome/gconf-dbus_cvs.bb @@ -8,18 +8,16 @@ RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" PV = "0.0cvs${CVSDATE}" -PR = "r6" +PR = "r8" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \ file://gconf-dbus-update.patch;patch=1;pnum=0 \ file://69gconfd-dbus" -FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir}" - +inherit pkgconfig autotools S = "${WORKDIR}/gconf" - -inherit pkgconfig autotools +FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*" EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" @@ -35,4 +33,6 @@ do_stage() { do_install_append () { install -d ${D}/${sysconfdir}/X11/Xsession.d install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/ + install -d ${D}/${datadir}/dbus-1.0/services/ + install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ } diff --git a/packages/psmisc/psmisc_21.8.bb b/packages/psmisc/psmisc_21.8.bb new file mode 100644 index 0000000000..1a6a10e045 --- /dev/null +++ b/packages/psmisc/psmisc_21.8.bb @@ -0,0 +1,42 @@ +LICENSE = "GPL" +DESCRIPTION = "procfs tools" +SECTION = "base" +PRIORITY = "required" +MAINTAINER = "Greg Gilbert <greg@treke.net>" +DEPENDS = "ncurses" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz" +S = "${WORKDIR}/psmisc-${PV}" + +inherit autotools gettext + +ALLOW_EMPTY = "1" + +PACKAGES = "${PN} fuser fuser-doc \ + killall killall-doc \ + pstree pstree-doc" + +FILES_${PN} = "" +RDEPENDS_${PN} = "fuser killall pstree" + +FILES_fuser = "${bindir}/fuser" +FILES_fuser-doc = "${mandir}/man1/fuser*" + +FILES_killall = "${bindir}/killall.${PN}" +FILES_killall-doc = "${mandir}/man1/killall*" + +FILES_pstree = "${bindir}/pstree" +FILES_pstree-doc = "${mandir}/man1/pstree*" + +do_install_append() { + mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN} +} + +pkg_postinst_killall() { + update-alternatives --install ${bindir}/killall killall killall.${PN} 90 +} + +pkg_postrm_killall() { + update-alternatives --remove ${bindir}/killall killall.${PN} +} diff --git a/packages/squashfs-tools/files/Makefile-2.2.patch b/packages/squashfs-tools/files/Makefile-2.2.patch new file mode 100644 index 0000000000..7a16129bbc --- /dev/null +++ b/packages/squashfs-tools/files/Makefile-2.2.patch @@ -0,0 +1,21 @@ +--- squashfs-tools/Makefile.orig 2005-10-26 18:15:43.641623000 +0100 ++++ squashfs-tools/Makefile 2005-10-26 18:21:29.747253250 +0100 +@@ -1,12 +1,17 @@ + INCLUDEDIR = . ++CFLAGS_R = -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE ++LIBS = -lz + + CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -g + + mksquashfs: mksquashfs.o read_fs.o sort.o +- $(CC) mksquashfs.o read_fs.o sort.o -lz -o $@ ++ $(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o -lz -o $@ + + mksquashfs.o: mksquashfs.c mksquashfs.h ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o mksquashfs.o mksquashfs.c + + read_fs.o: read_fs.c read_fs.h ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o read_fs.o read_fs.c + + sort.o: sort.c ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o sort.o sort.c diff --git a/packages/squashfs-tools/squashfs-tools-native_2.2r2.bb b/packages/squashfs-tools/squashfs-tools-native_2.2r2.bb new file mode 100644 index 0000000000..c78f00c540 --- /dev/null +++ b/packages/squashfs-tools/squashfs-tools-native_2.2r2.bb @@ -0,0 +1,13 @@ +include squashfs-tools_${PV}.bb + +DEPENDS = "lzma-native" + +inherit native + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PACKAGES = "" + +do_stage () { + install -m 0755 mksquashfs ${STAGING_BINDIR}/ + install -m 0755 mksquashfs-lzma ${STAGING_BINDIR}/ +} diff --git a/packages/squashfs-tools/squashfs-tools_2.2r2.bb b/packages/squashfs-tools/squashfs-tools_2.2r2.bb new file mode 100644 index 0000000000..640433fcba --- /dev/null +++ b/packages/squashfs-tools/squashfs-tools_2.2r2.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux." +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +DEPENDS = "lzma" +SECTION = "base" +LICENSE = "GPLv2" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz \ + file://Makefile-2.2.patch;patch=1 \ + file://squashfs2.0-tools-lzma.patch;patch=1" +S = "${WORKDIR}/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}/squashfs-tools" + +prefix = "" + +do_compile() { + oe_runmake mksquashfs mksquashfs-lzma +} + +do_install () { + install -d ${D}${sbindir} + install -m 0755 mksquashfs ${D}${sbindir}/ + install -m 0755 mksquashfs-lzma ${D}${sbindir}/ +} |