From 28ca65ea6d6219ac064b27a4b91294131cbfb4bf Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 17 Jul 2005 04:18:39 +0000 Subject: util-linux does not build on uclibc (fails in do_install step). --- packages/meta/openslug-packages.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 3fb0587727..2a7bc68794 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -33,7 +33,6 @@ OPENSLUG_DEVELOPMENT = "\ pciutils \ quilt \ sed \ - util-linux \ " # These packages only build on TARGET_OS=linux, not @@ -41,6 +40,7 @@ OPENSLUG_DEVELOPMENT = "\ OPENSLUG_DEVELOPMENT_append_linux = "\ perl \ tar \ + util-linux \ " -- cgit v1.2.3 From 440d78ee0713d56b60320ac0bd9a4b38a42739dd Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 17 Jul 2005 12:38:14 +0000 Subject: patcher on FreeBSD: -Patch patcher to use gpatch on FreeBSD --- packages/patcher/files/.mtn2git_empty | 0 packages/patcher/files/freebsd_gpatch.patch | 28 ++++++++++++++++++++++++++++ packages/patcher/patcher-native_20040913.bb | 1 + 3 files changed, 29 insertions(+) create mode 100644 packages/patcher/files/.mtn2git_empty create mode 100644 packages/patcher/files/freebsd_gpatch.patch diff --git a/packages/patcher/files/.mtn2git_empty b/packages/patcher/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/patcher/files/freebsd_gpatch.patch b/packages/patcher/files/freebsd_gpatch.patch new file mode 100644 index 0000000000..f7e107a410 --- /dev/null +++ b/packages/patcher/files/freebsd_gpatch.patch @@ -0,0 +1,28 @@ +On FreeBSD the default patch program has a different command line +interface than GNU patch. Make patcher use the GNU patch. + + +--- patcher.py.old Mon Sep 13 21:59:05 2004 ++++ patcher.py Sun Jul 17 14:24:50 2005 +@@ -631,8 +631,8 @@ + my $res; + + # ... then we look if the patch would apply cleanly ... +- print "DEBUG: patch --dry-run $opt\n" if $debug > 1; +- $res = system("patch --dry-run $opt >$patchlog 2>/dev/null"); ++ print "DEBUG: gpatch --dry-run $opt\n" if $debug > 1; ++ $res = system("gpatch --dry-run $opt >$patchlog 2>/dev/null"); + if ($res != 0) { + unless ($do_force) { + unlink($patchlog); +@@ -669,8 +669,8 @@ + # Finally we apply the patch. No need to create backup copies with -b, + # that has been done by PutIntoPatch() + $opt = "-f $opt" if $do_force; +- print "DEBUG: patch $opt\n" if $debug > 1; +- $res = system("patch $opt >$patchlog"); ++ print "DEBUG: gpatch $opt\n" if $debug > 1; ++ $res = system("gpatch $opt >$patchlog"); + unlink($patchlog); + $res = 0 if $do_force && $res == 256; + if ($res != 0) { diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb index e1ac1c1ca2..1d49d0e035 100644 --- a/packages/patcher/patcher-native_20040913.bb +++ b/packages/patcher/patcher-native_20040913.bb @@ -11,6 +11,7 @@ PR = "r1" inherit native SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2" +SRC_URI_append_build-fbsd = " file://freebsd_gpatch.patch;patch=1 " S = "${WORKDIR}/patcher" PATCHCLEANCMD = "" -- cgit v1.2.3 From c4a4b2905d3ffbc85217a48843d07e4fd887e203 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 17 Jul 2005 13:02:31 +0000 Subject: conf/bitbake.conf: -Add the BUILD_OS to the overrides. This allows us for example to use gpatch on FreeBSD instead of patch packages/patcher/patcher-native_...bb: -Change the PATCHCMD to use gpatch as well - s/build-fbsd/build-freebsd/ --- conf/bitbake.conf | 2 +- packages/patcher/files/freebsd_gpatch.patch | 4 ++-- packages/patcher/patcher-native_20040913.bb | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index caba7b51d5..1df713f2eb 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -364,7 +364,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" # when ${MACHINE} is 'ramses'. And finally '_local' overrides anything. # # This works for functions as well, they are really just environment variables. -OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}" +OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}" ################################################################## # Include the rest of the config files. diff --git a/packages/patcher/files/freebsd_gpatch.patch b/packages/patcher/files/freebsd_gpatch.patch index f7e107a410..ee6365f49d 100644 --- a/packages/patcher/files/freebsd_gpatch.patch +++ b/packages/patcher/files/freebsd_gpatch.patch @@ -2,8 +2,8 @@ On FreeBSD the default patch program has a different command line interface than GNU patch. Make patcher use the GNU patch. ---- patcher.py.old Mon Sep 13 21:59:05 2004 -+++ patcher.py Sun Jul 17 14:24:50 2005 +--- patcher/patcher.py.old Mon Sep 13 21:59:05 2004 ++++ patcher/patcher.py Sun Jul 17 14:24:50 2005 @@ -631,8 +631,8 @@ my $res; diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb index 1d49d0e035..833ca21a53 100644 --- a/packages/patcher/patcher-native_20040913.bb +++ b/packages/patcher/patcher-native_20040913.bb @@ -11,11 +11,12 @@ PR = "r1" inherit native SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2" -SRC_URI_append_build-fbsd = " file://freebsd_gpatch.patch;patch=1 " +SRC_URI_append_build-freebsd = " file://freebsd_gpatch.patch;patch=1 " S = "${WORKDIR}/patcher" PATCHCLEANCMD = "" PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" +PATCHCMD_build-freebsd = "num='%s'; name='%s'; file='%s'; gpatch -p "$num" -i "$file"" do_stage() { install -m 0755 patcher.py ${STAGING_BINDIR}/patcher -- cgit v1.2.3 From a7ad3651f6fc5ecf543246094a4786310e24bcb1 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 17 Jul 2005 13:21:20 +0000 Subject: base.bbclass: Make it compatible with FreeBSD Replace --no-derefence with -P according to the GNU cp manpage this option is the same as --no-derenfe and FreeBSD knows -P as well --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 0d29de144a..1da58a924e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -199,7 +199,7 @@ oe_libinstall() { oefatal "oe_libinstall: $dir/$f not found." fi elif [ -L "$f" ]; then - __runcmd cp --no-dereference "$f" $destpath/ + __runcmd cp -P "$f" $destpath/ elif [ ! -L "$f" ]; then libfile="$f" __runcmd install -m 0755 $libfile $destpath/ -- cgit v1.2.3 From 3e2660b9ae1c96b9cd44231a9f1dd280b6f48334 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 17 Jul 2005 15:12:21 +0000 Subject: upgrade python-imdbpy to 2.0 --- packages/python/python-imdbpy_1.9.bb | 12 ------------ packages/python/python-imdbpy_2.0.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 packages/python/python-imdbpy_1.9.bb create mode 100644 packages/python/python-imdbpy_2.0.bb diff --git a/packages/python/python-imdbpy_1.9.bb b/packages/python/python-imdbpy_1.9.bb deleted file mode 100644 index 5e098478b2..0000000000 --- a/packages/python/python-imdbpy_1.9.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "IMDbPY is a Python package useful to retrieve and manage the data of the IMDb movie database." -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -SRCNAME = "imdbpy" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" -S = "${WORKDIR}/IMDbPY-${PV}" - -inherit distutils - diff --git a/packages/python/python-imdbpy_2.0.bb b/packages/python/python-imdbpy_2.0.bb new file mode 100644 index 0000000000..2df3b4229c --- /dev/null +++ b/packages/python/python-imdbpy_2.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "IMDbPY is a Python package useful to retrieve and manage the data of the IMDb movie database." +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" +SRCNAME = "IMDbPY" +PR = "ml0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/imbdbpy/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils + -- cgit v1.2.3 From ee74f054509bccaae6b2e3014afa12d965080d13 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 17 Jul 2005 16:30:18 +0000 Subject: add libpcap 0.9.3 --- packages/libpcap/libpcap-0.9.3/.mtn2git_empty | 0 packages/libpcap/libpcap-0.9.3/shared.patch | 119 ++++++++++++++++++++++++++ packages/libpcap/libpcap_0.9.3.bb | 31 +++++++ 3 files changed, 150 insertions(+) create mode 100644 packages/libpcap/libpcap-0.9.3/.mtn2git_empty create mode 100644 packages/libpcap/libpcap-0.9.3/shared.patch create mode 100644 packages/libpcap/libpcap_0.9.3.bb diff --git a/packages/libpcap/libpcap-0.9.3/.mtn2git_empty b/packages/libpcap/libpcap-0.9.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libpcap/libpcap-0.9.3/shared.patch b/packages/libpcap/libpcap-0.9.3/shared.patch new file mode 100644 index 0000000000..cc66a5e5ef --- /dev/null +++ b/packages/libpcap/libpcap-0.9.3/shared.patch @@ -0,0 +1,119 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libpcap-0.9.3/Makefile.in~shared ++++ libpcap-0.9.3/Makefile.in +@@ -37,6 +37,15 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + ++# some defines for shared library compilation - FIXME, if not matching ++MAJ=0.9 ++MIN=3 ++VERSION=$(MAJ).$(MIN) ++LIBNAME=pcap ++LIBRARY=lib$(LIBNAME).a ++SOLIBRARY=lib$(LIBNAME).so ++SHAREDLIB=$(SOLIBRARY).$(VERSION) ++ + # + # You shouldn't need to edit anything below. + # +@@ -50,6 +59,7 @@ + + # Standard CFLAGS + CFLAGS = $(CCOPT) $(INCLS) $(DEFS) ++CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ) + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -70,6 +80,9 @@ + .c.o: + @rm -f $@ + $(CC) $(CFLAGS) -c $(srcdir)/$*.c ++%_pic.o: %.c ++ @rm -f $@ ++ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c + + PSRC = pcap-@V_PCAP@.c + FSRC = fad-@V_FINDALLDEVS@.c +@@ -84,6 +97,7 @@ + # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot + # hack the extra indirection + OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) ++OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) + HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ + ethertype.h gencode.h gnuc.h + GENHDR = \ +@@ -95,15 +109,22 @@ + TAGFILES = \ + $(SRC) $(HDR) $(TAGHDR) + +-CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c ++CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* + +-all: libpcap.a ++all: libpcap.a $(SHAREDLIB) + + libpcap.a: $(OBJ) + @rm -f $@ + ar rc $@ $(OBJ) $(LIBS) + $(RANLIB) $@ + ++$(SHAREDLIB): $(OBJ_PIC) ++ -@rm -f $@ ++ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) ++ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc ++ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) ++ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) ++ + shared: libpcap.$(DYEXT) + + # +@@ -129,6 +150,9 @@ + scanner.o: scanner.c tokdefs.h + $(CC) $(CFLAGS) -c scanner.c + ++scanner_pic.o: scanner.c tokdefs.h ++ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c ++ + pcap.o: version.h + + tokdefs.h: grammar.c +@@ -142,9 +166,16 @@ + @rm -f $@ + $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c + ++grammer_pic.o: grammar.c ++ @rm -f $@ ++ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c ++ + version.o: version.c + $(CC) $(CFLAGS) -c version.c + ++version_pic.o: version.c ++ $(CC) -fPIC $(CFLAGS) -c version.c -o $@ ++ + snprintf.o: $(srcdir)/missing/snprintf.c + $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c + +@@ -170,11 +201,17 @@ + bpf_filter.o: bpf_filter.c + $(CC) $(CFLAGS) -c bpf_filter.c + ++bpf_filter_pic.o: bpf_filter.c ++ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@ ++ + install: libpcap.a + [ -d $(DESTDIR)$(libdir) ] || \ + (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a + $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a ++ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ ++ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) ++ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) + [ -d $(DESTDIR)$(includedir) ] || \ + (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) + $(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h diff --git a/packages/libpcap/libpcap_0.9.3.bb b/packages/libpcap/libpcap_0.9.3.bb new file mode 100644 index 0000000000..7436533a95 --- /dev/null +++ b/packages/libpcap/libpcap_0.9.3.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Network Packet Capture Library" +HOMEPAGE = "http://www.tcpdump.org/" +LICENSE = "BSD" +SECTION = "libs/network" +PR = "r0" + +SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \ + file://shared.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--with-pcap=linux" + +CPPFLAGS_prepend = "-I${S} " +CFLAGS_prepend = "-I${S} " +CXXFLAGS_prepend = "-I${S} " + +do_configure_prepend () { + if [ ! -e acinclude.m4 ]; then + cat aclocal.m4 > acinclude.m4 + fi +} + +do_stage () { + install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h + install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h + install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h + oe_libinstall -a -so libpcap ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/net + ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h +} -- cgit v1.2.3 From e880a4b5922eba84611fede85ff5ef2dbe50eb4b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 17 Jul 2005 16:36:42 +0000 Subject: add tcpdump 3.9.3 --- packages/tcpdump/tcpdump_3.9.3.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 packages/tcpdump/tcpdump_3.9.3.bb diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.3.bb new file mode 100644 index 0000000000..d3422539ce --- /dev/null +++ b/packages/tcpdump/tcpdump_3.9.3.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +LICENSE = "BSD" +SECTION = "console/network" +PRIORITY = "optional" +DEPENDS = "libpcap-0.9.3 openssl" +PR = "r0" + +SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz" + +inherit autotools + +do_configure() { + gnu-configize + oe_runconf +} + -- cgit v1.2.3 From 2250567f7e1ed2633e136e56e250fa006706bad7 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 17 Jul 2005 19:37:24 +0000 Subject: classpath: upgrade to 0.16 --- packages/classpath/classpath_0.16.bb | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 packages/classpath/classpath_0.16.bb diff --git a/packages/classpath/classpath_0.16.bb b/packages/classpath/classpath_0.16.bb new file mode 100644 index 0000000000..3e1f51afd4 --- /dev/null +++ b/packages/classpath/classpath_0.16.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "GNU Classpath standard Java libraries" +HOMEPAGE = "http://www.gnu.org/software/classpath/" +LICENSE = "Classpath" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner " +SECTION = "libs" +PR = "r0" + +DEPENDS = "glib-2.0 gtk+ libart-lgpl pango jikes-native" +RDEPENDS_${PN} = "${PN}-common (${PV})" + +SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ + file://disable-automake-checks.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--with-jikes" + +PACKAGES += " ${PN}-common ${PN}-examples" + +FILES_${PN} = "${libdir}/${PN}" +FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" +FILES_${PN}-examples = "${datadir}/${PN}/examples" + +do_install() { + autotools_do_install + mv ${D}${libdir}/security ${D}${libdir}/${PN} +} -- cgit v1.2.3 From f5df47c204d9778d0835733016d44aaf7129e680 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 17 Jul 2005 19:39:18 +0000 Subject: classpath: fix DEPENDS --- packages/classpath/classpath_0.14.bb | 2 +- packages/classpath/classpath_0.15.bb | 2 +- packages/classpath/classpath_0.16.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/classpath/classpath_0.14.bb b/packages/classpath/classpath_0.14.bb index 3e1f51afd4..ec29ad9cb8 100644 --- a/packages/classpath/classpath_0.14.bb +++ b/packages/classpath/classpath_0.14.bb @@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner " SECTION = "libs" PR = "r0" -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango jikes-native" +DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ diff --git a/packages/classpath/classpath_0.15.bb b/packages/classpath/classpath_0.15.bb index 3e1f51afd4..ec29ad9cb8 100644 --- a/packages/classpath/classpath_0.15.bb +++ b/packages/classpath/classpath_0.15.bb @@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner " SECTION = "libs" PR = "r0" -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango jikes-native" +DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ diff --git a/packages/classpath/classpath_0.16.bb b/packages/classpath/classpath_0.16.bb index 3e1f51afd4..ec29ad9cb8 100644 --- a/packages/classpath/classpath_0.16.bb +++ b/packages/classpath/classpath_0.16.bb @@ -6,7 +6,7 @@ MAINTAINER = "Rene Wagner " SECTION = "libs" PR = "r0" -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango jikes-native" +DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ -- cgit v1.2.3 From d974a5a9ea1437acad1346ab1ee7b170690a179c Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 17 Jul 2005 19:41:49 +0000 Subject: Horrible hacky, maybe working, work round for shutdown -r. Please report any future hangs on shutdown -r in slugbug 145. --- packages/linux/nslu2-kernel_2.6.12.2.bb | 2 +- packages/linux/nslu2-kernel_2.6.12.bb | 2 +- .../linux/openslug-kernel-2.6.11.2/xscale-reset.patch | 2 +- packages/linux/openslug-kernel_2.6.11.2.bb | 2 +- .../openslug-init-0.10/initscripts/umountinitrd.sh | 17 +++++++++++++++-- packages/openslug-init/openslug-init_0.10.bb | 2 +- 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index 8ab9379708..afd0ec8321 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r1" +PR = "r2" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/nslu2-kernel_2.6.12.bb b/packages/linux/nslu2-kernel_2.6.12.bb index e3e536fe3e..8ab9379708 100644 --- a/packages/linux/nslu2-kernel_2.6.12.bb +++ b/packages/linux/nslu2-kernel_2.6.12.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r0" +PR = "r1" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch b/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch index 3995ba691e..4e68456e20 100644 --- a/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch +++ b/packages/linux/openslug-kernel-2.6.11.2/xscale-reset.patch @@ -102,7 +102,7 @@ + ldr r7, =IXP4XX_TIMER_BASE_VIRT + ldr r8, =IXP4XX_WDT_KEY @ set key + str r8, [r7, #IXP4XX_OSWK_OFFSET] -+ mov r8, #0x10000000 @ about 4 seconds ++ mov r8, #0x1000000 @ about 0.25 seconds + str r8, [r7, #IXP4XX_OSWT_OFFSET] @ set timer + mov r8, #(IXP4XX_WDT_RESET_ENABLE | IXP4XX_WDT_COUNT_ENABLE) + str r8, [r7, #IXP4XX_OSWE_OFFSET] @ enable reset diff --git a/packages/linux/openslug-kernel_2.6.11.2.bb b/packages/linux/openslug-kernel_2.6.11.2.bb index c4408ae479..1fe7da7344 100644 --- a/packages/linux/openslug-kernel_2.6.11.2.bb +++ b/packages/linux/openslug-kernel_2.6.11.2.bb @@ -2,7 +2,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Linksys NSLU2 device" LICENSE = "GPL" MAINTAINER = "Chris Larson " -PR = "r13" +PR = "r14" KERNEL_SUFFIX = "openslug" diff --git a/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh b/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh index b7ae8b76e5..da39b425f8 100644 --- a/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh +++ b/packages/openslug-init/openslug-init-0.10/initscripts/umountinitrd.sh @@ -1,5 +1,18 @@ #!/bin/sh # # umount /mnt, which is where the initrd ends up mounted -# if the directory /initrd is not present -exec umount /mnt 2>/dev/null +# if the directory /initrd is not present, if this fails +# then the /initrd is mounted and we want to remount that +# ro - this works round the shutdown -r hang problem +umount /mnt 2>/dev/null || { + # need the device for a remount + . /etc/default/functions + ffspart=Flashdisk + ffsdev="$(mtblockdev $ffspart)" + if test -n "$ffsdev" -a -b "$ffsdev" + then + mount -o remount,ro "$ffsdev" /initrd + else + echo "Flashdisk: $ffsdev: flash device not found" >&2 + fi +} diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb index 537760f8d5..59b8c0fd5d 100644 --- a/packages/openslug-init/openslug-init_0.10.bb +++ b/packages/openslug-init/openslug-init_0.10.bb @@ -3,7 +3,7 @@ SECTION = "console/network" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r37" +PR = "r38" SRC_URI = "file://linuxrc \ file://boot/flash \ -- cgit v1.2.3 From 721c22c624392cf1d62a9f8675c6d72b55bc0c9e Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 17 Jul 2005 21:28:18 +0000 Subject: sablevm(-classpath): upgrade to 1.12 and work around internal libs nonsense --- packages/sablevm/sablevm/.mtn2git_empty | 0 packages/sablevm/sablevm/no-internal-libs.patch | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 packages/sablevm/sablevm/.mtn2git_empty create mode 100644 packages/sablevm/sablevm/no-internal-libs.patch diff --git a/packages/sablevm/sablevm/.mtn2git_empty b/packages/sablevm/sablevm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sablevm/sablevm/no-internal-libs.patch b/packages/sablevm/sablevm/no-internal-libs.patch new file mode 100644 index 0000000000..d082bfd076 --- /dev/null +++ b/packages/sablevm/sablevm/no-internal-libs.patch @@ -0,0 +1,20 @@ +--- sablevm-1.12.orig/src/Makefile.am 2005-07-05 03:10:33.000000000 +0200 ++++ sablevm-1.12/src/Makefile.am 2005-07-17 22:30:28.000000000 +0200 +@@ -6,16 +6,8 @@ + ## * modification of this source file. * + ## * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + +-DIST_SUBDIRS = include libffi libpopt libsablevm sablevm ++DIST_SUBDIRS = include libsablevm sablevm + + SUBDIRS = include + +-if CONV_LIBFFI +-SUBDIRS += libffi +-endif +- +-if CONV_LIBPOPT +-SUBDIRS += libpopt +-endif +- + SUBDIRS += libsablevm sablevm -- cgit v1.2.3 From 829db8137bd0e83a8aac4599eb7edc6c0f2fa445 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 17 Jul 2005 21:48:00 +0000 Subject: udev: - remove a couple of obsolete versions - add 063 (default preference = -1, see inside for why) --- packages/udev/udev-042/.mtn2git_empty | 0 packages/udev/udev-042/flags.patch | 67 --------------------------- packages/udev/udev-050/.mtn2git_empty | 0 packages/udev/udev-050/flags.patch | 69 ---------------------------- packages/udev/udev-050/kill_logname.patch | 12 ----- packages/udev/udev-054/.mtn2git_empty | 0 packages/udev/udev-054/flags.patch | 75 ------------------------------- packages/udev/udev-063/.mtn2git_empty | 0 packages/udev/udev-063/flags.patch | 53 ++++++++++++++++++++++ packages/udev/udev-063/noasmlinkage.patch | 38 ++++++++++++++++ packages/udev/udev.inc | 4 +- packages/udev/udev_042.bb | 9 ---- packages/udev/udev_050.bb | 8 ---- packages/udev/udev_054.bb | 7 --- packages/udev/udev_058.bb | 5 --- packages/udev/udev_063.bb | 13 ++++++ 16 files changed, 107 insertions(+), 253 deletions(-) delete mode 100644 packages/udev/udev-042/.mtn2git_empty delete mode 100644 packages/udev/udev-042/flags.patch delete mode 100644 packages/udev/udev-050/.mtn2git_empty delete mode 100644 packages/udev/udev-050/flags.patch delete mode 100644 packages/udev/udev-050/kill_logname.patch delete mode 100644 packages/udev/udev-054/.mtn2git_empty delete mode 100644 packages/udev/udev-054/flags.patch create mode 100644 packages/udev/udev-063/.mtn2git_empty create mode 100644 packages/udev/udev-063/flags.patch create mode 100644 packages/udev/udev-063/noasmlinkage.patch delete mode 100644 packages/udev/udev_042.bb delete mode 100644 packages/udev/udev_050.bb delete mode 100644 packages/udev/udev_054.bb create mode 100644 packages/udev/udev_063.bb diff --git a/packages/udev/udev-042/.mtn2git_empty b/packages/udev/udev-042/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/udev/udev-042/flags.patch b/packages/udev/udev-042/flags.patch deleted file mode 100644 index a5a791df33..0000000000 --- a/packages/udev/udev-042/flags.patch +++ /dev/null @@ -1,67 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- udev-042/Makefile~flags -+++ udev-042/Makefile -@@ -119,16 +119,18 @@ - endif - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DLOG -+ override CFLAGS += -DLOG - endif - - # if DEBUG is enabled, then we do not strip or optimize -+override CFLAGS += -D_GNU_SOURCE - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE -+ CFLAGS += -O1 -g -+ override CFLAGS += -DDEBUG - LDFLAGS += -Wl,-warn-common - STRIPCMD = /bin/true -Since_we_are_debugging - else -- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE -+ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer - LDFLAGS += -s -Wl,-warn-common - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment - endif -@@ -150,8 +152,8 @@ - - CRT0 = $(KLIBC_DIR)/crt0.o - LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) -- CFLAGS += $(WARNINGS) -nostdinc \ -- $(OPTFLAGS) \ -+ CFLAGS += $(WARNINGS) $(OPTFLAGS) -+ override CFLAGS += -nostdinc \ - -D__KLIBC__ -fno-builtin-printf \ - -I$(KLIBC_FIXUPS_DIR) \ - -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \ -@@ -161,12 +163,13 @@ - -I$(GCCINCDIR) \ - -I$(LINUX_INCLUDE_DIR) - LIB_OBJS = -- LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs -+ override LDFLAGS += --static --nostdlib -nostartfiles -nodefaultlibs - else - WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - CRT0 = - LIBC = -- CFLAGS += $(WARNINGS) -I$(GCCINCDIR) -+ CFLAGS += $(WARNINGS) -+ override CFLAGS += -I$(GCCINCDIR) - LIB_OBJS = -lc - LDFLAGS = - endif -@@ -176,8 +179,8 @@ - LIB_OBJS += -lselinux - endif - --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -- -I$(PWD)/libsysfs -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+ -I$(PWD)/libsysfs - - # config files automatically generated - GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf diff --git a/packages/udev/udev-050/.mtn2git_empty b/packages/udev/udev-050/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/udev/udev-050/flags.patch b/packages/udev/udev-050/flags.patch deleted file mode 100644 index b59825f7ac..0000000000 --- a/packages/udev/udev-050/flags.patch +++ /dev/null @@ -1,69 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: udev-050/Makefile -=================================================================== ---- udev-050.orig/Makefile 2004-12-18 00:53:07.000000000 -0500 -+++ udev-050/Makefile 2005-01-21 19:23:45.699728872 -0500 -@@ -114,16 +114,18 @@ - CFLAGS := -pipe - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DLOG -+ override CFLAGS += -DLOG - endif - - # if DEBUG is enabled, then we do not strip or optimize -+override CFLAGS += -D_GNU_SOURCE - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE -+ CFLAGS += -O1 -g -+ override CFLAGS += -DDEBUG - LDFLAGS += -Wl,-warn-common - STRIPCMD = /bin/true -Since_we_are_debugging - else -- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE -+ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer - LDFLAGS += -s -Wl,-warn-common - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment - endif -@@ -144,8 +146,8 @@ - - CRT0 = $(KLIBC_DIR)/crt0.o - LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) -- CFLAGS += $(WARNINGS) -nostdinc \ -- $(OPTFLAGS) \ -+ CFLAGS += $(WARNINGS) $(OPTFLAGS) -+ override CFLAGS += -nostdinc \ - -D__KLIBC__ -fno-builtin-printf \ - -I$(KLIBC_FIXUPS_DIR) \ - -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \ -@@ -155,12 +157,13 @@ - -I$(GCCINCDIR) \ - -I$(LINUX_INCLUDE_DIR) - LIB_OBJS = -- LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs -+ override LDFLAGS += --static --nostdlib -nostartfiles -nodefaultlibs - else - WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - CRT0 = - LIBC = -- CFLAGS += $(WARNINGS) -I$(GCCINCDIR) -+ CFLAGS += $(WARNINGS) -+ override CFLAGS += -I$(GCCINCDIR) - LIB_OBJS = -lc - LDFLAGS = - endif -@@ -170,8 +173,8 @@ - LIB_OBJS += -lselinux - endif - --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -- -I$(PWD)/libsysfs -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+ -I$(PWD)/libsysfs - - # config files automatically generated - GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf diff --git a/packages/udev/udev-050/kill_logname.patch b/packages/udev/udev-050/kill_logname.patch deleted file mode 100644 index 4e30ab444e..0000000000 --- a/packages/udev/udev-050/kill_logname.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: udev-050/extras/volume_id/udev_volume_id.c -=================================================================== ---- udev-050.orig/extras/volume_id/udev_volume_id.c 2004-12-18 00:53:07.000000000 -0500 -+++ udev-050/extras/volume_id/udev_volume_id.c 2005-01-21 19:26:44.992472232 -0500 -@@ -37,7 +37,6 @@ - #define BLKGETSIZE64 _IOR(0x12,114,size_t) - - #ifdef LOG --unsigned char logname[LOGNAME_SIZE]; - void log_message(int level, const char *format, ...) - { - va_list args; diff --git a/packages/udev/udev-054/.mtn2git_empty b/packages/udev/udev-054/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/udev/udev-054/flags.patch b/packages/udev/udev-054/flags.patch deleted file mode 100644 index 2bd9a364da..0000000000 --- a/packages/udev/udev-054/flags.patch +++ /dev/null @@ -1,75 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: udev-054/Makefile -=================================================================== ---- udev-054.orig/Makefile 2005-02-25 21:18:21.000000000 -0600 -+++ udev-054/Makefile 2005-02-26 01:06:10.000000000 -0600 -@@ -154,20 +154,22 @@ - - SYSFS = $(PWD)/libsysfs/sysfs.a - --CFLAGS += -I$(PWD)/libsysfs/sysfs \ -+override CFLAGS += -I$(PWD)/libsysfs/sysfs \ - -I$(PWD)/libsysfs - - ifeq ($(strip $(USE_LOG)),true) -- CFLAGS += -DLOG -+ override CFLAGS += -DLOG - endif - - # if DEBUG is enabled, then we do not strip or optimize -+override CFLAGS += -D_GNU_SOURCE - ifeq ($(strip $(DEBUG)),true) -- CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE -+ CFLAGS += -O1 -g -+ override CFLAGS += -DDEBUG - LDFLAGS += -Wl,-warn-common - STRIPCMD = /bin/true -Since_we_are_debugging - else -- CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE -+ CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer - LDFLAGS += -s -Wl,-warn-common - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment - endif -@@ -187,8 +189,8 @@ - - CRT0 = $(KLIBC_DIR)/crt0.o - LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0) -- CFLAGS += $(WARNINGS) -nostdinc \ -- $(OPTFLAGS) \ -+ CFLAGS += $(WARNINGS) $(OPTFLAGS) -+ override CFLAGS += -nostdinc \ - -D__KLIBC__ -fno-builtin-printf \ - -I$(KLIBC_FIXUPS_DIR) \ - -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \ -@@ -198,7 +200,7 @@ - -I$(GCCINCDIR) \ - -I$(LINUX_INCLUDE_DIR) - LIB_OBJS = -- LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs -+ override LDFLAGS += --static --nostdlib -nostartfiles -nodefaultlibs - - HEADERS += \ - klibc_fixups/klibc_fixups.h \ -@@ -213,7 +215,8 @@ - WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations - CRT0 = - LIBC = -- CFLAGS += $(WARNINGS) -I$(GCCINCDIR) -+ CFLAGS += $(WARNINGS) -+ override CFLAGS += -I$(GCCINCDIR) - LIB_OBJS = -lc - LDFLAGS = - endif -@@ -221,7 +224,7 @@ - ifeq ($(strip $(USE_SELINUX)),true) - UDEV_OBJS += udev_selinux.o - LIB_OBJS += -lselinux -- CFLAGS += -DUSE_SELINUX -+ override CFLAGS += -DUSE_SELINUX - endif - - ifeq ($(strip $(V)),false) diff --git a/packages/udev/udev-063/.mtn2git_empty b/packages/udev/udev-063/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/udev-063/flags.patch b/packages/udev/udev-063/flags.patch new file mode 100644 index 0000000000..e6969f2f63 --- /dev/null +++ b/packages/udev/udev-063/flags.patch @@ -0,0 +1,53 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udev-062/Makefile~flags.patch ++++ udev-062/Makefile +@@ -151,16 +151,17 @@ + + SYSFS = $(PWD)/libsysfs/sysfs.a + +-CFLAGS += -I$(PWD)/libsysfs/sysfs \ ++override CFLAGS += -I$(PWD)/libsysfs/sysfs \ + -I$(PWD)/libsysfs + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DUSE_LOG ++ override CFLAGS += -DUSE_LOG + endif + + # if DEBUG is enabled, then we do not strip or optimize + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -O1 -g -DDEBUG ++ CFLAGS += -O1 -g ++ override CFLAGS += -DDEBUG + LDFLAGS += -Wl + STRIPCMD = /bin/true -Since_we_are_debugging + else +@@ -176,19 +177,20 @@ + KLCC = $(KLIBC_INSTALL)/bin/$(CROSS)klcc + CC = $(KLCC) + LD = $(KLCC) ++ override LDFLAGS += -static + else +- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations ++ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations + endif + + ifeq ($(strip $(USE_SELINUX)),true) + UDEV_OBJS += udev_selinux.o + LIB_OBJS += -lselinux +- CFLAGS += -DUSE_SELINUX ++ override CFLAGS += -DUSE_SELINUX + endif + + ifeq ($(strip $(USE_STATIC)),true) +- CFLAGS += -DUSE_STATIC +- LDFLAGS += -static ++ override CFLAGS += -DUSE_STATIC ++ override LDFLAGS += -static + endif + + ifeq ($(strip $(V)),false) diff --git a/packages/udev/udev-063/noasmlinkage.patch b/packages/udev/udev-063/noasmlinkage.patch new file mode 100644 index 0000000000..0d8e854c0e --- /dev/null +++ b/packages/udev/udev-063/noasmlinkage.patch @@ -0,0 +1,38 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udev-062/udev.c~noasmlinkage.patch ++++ udev-062/udev.c +@@ -54,7 +54,7 @@ + } + #endif + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: +--- udev-062/udevd.c~noasmlinkage.patch ++++ udev-062/udevd.c +@@ -639,7 +639,7 @@ + return msg; + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + int rc; + +--- udev-062/udevstart.c~noasmlinkage.patch ++++ udev-062/udevstart.c +@@ -323,7 +323,7 @@ + exec_list(&device_list); + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc index 0648034276..00abd36ba2 100644 --- a/packages/udev/udev.inc +++ b/packages/udev/udev.inc @@ -1,7 +1,6 @@ DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \ /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." LICENSE = "GPL" -PR = "r3" UDEV_DEVFS_RULES ?= "0" @@ -37,4 +36,7 @@ do_install () { if [ "${UDEV_DEVFS_RULES}" = "1" ]; then install -m 0644 ${S}/etc/udev/udev.rules.devfs ${D}${sysconfdir}/udev/rules.d/50-udev.rules fi + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${S}/etc/udev/debian/permissions.rules ${D}${sysconfdir}/udev/rules.d/ } + diff --git a/packages/udev/udev_042.bb b/packages/udev/udev_042.bb deleted file mode 100644 index af03818cfd..0000000000 --- a/packages/udev/udev_042.bb +++ /dev/null @@ -1,9 +0,0 @@ -PR = "r3" - -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://flags.patch;patch=1 \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1 \ - file://init" - -include udev.inc diff --git a/packages/udev/udev_050.bb b/packages/udev/udev_050.bb deleted file mode 100644 index be616b5493..0000000000 --- a/packages/udev/udev_050.bb +++ /dev/null @@ -1,8 +0,0 @@ -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://flags.patch;patch=1 \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1 \ - file://kill_logname.patch;patch=1 \ - file://init" - -include udev.inc diff --git a/packages/udev/udev_054.bb b/packages/udev/udev_054.bb deleted file mode 100644 index 4c54c56b57..0000000000 --- a/packages/udev/udev_054.bb +++ /dev/null @@ -1,7 +0,0 @@ -SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ - file://flags.patch;patch=1 \ - file://tmpfs.patch;patch=1 \ - file://noasmlinkage.patch;patch=1 \ - file://init" - -include udev.inc diff --git a/packages/udev/udev_058.bb b/packages/udev/udev_058.bb index 20f49ac7c5..539e7aedb8 100644 --- a/packages/udev/udev_058.bb +++ b/packages/udev/udev_058.bb @@ -8,8 +8,3 @@ include udev.inc PR = "r3" # CFLAGS += -I${STAGING_INCDIR}/sysfs - -do_install_append() { - install -d ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${S}/etc/udev/debian/permissions.rules ${D}${sysconfdir}/udev/rules.d/ -} diff --git a/packages/udev/udev_063.bb b/packages/udev/udev_063.bb new file mode 100644 index 0000000000..60340ca175 --- /dev/null +++ b/packages/udev/udev_063.bb @@ -0,0 +1,13 @@ +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://tmpfs.patch;patch=1 \ + file://noasmlinkage.patch;patch=1 \ + file://flags.patch;patch=1 \ + file://init" + +include udev.inc + +PR = "r0" + +#FIXME a) udevd doesn't start with our init script (the init script seems to be pretty oudated) +#FIXME b) lots of alignment errors when manually starting udevd +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From cb9874655bfe707d7cd177b48cf3f03f4be41091 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 17 Jul 2005 21:50:06 +0000 Subject: jamvm: use a single dir for patches --- packages/jamvm/jamvm-1.3.0/.mtn2git_empty | 0 packages/jamvm/jamvm-1.3.0/heap-size.patch | 22 ---------------------- packages/jamvm/jamvm/.mtn2git_empty | 0 packages/jamvm/jamvm/heap-size.patch | 22 ++++++++++++++++++++++ 4 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 packages/jamvm/jamvm-1.3.0/.mtn2git_empty delete mode 100644 packages/jamvm/jamvm-1.3.0/heap-size.patch create mode 100644 packages/jamvm/jamvm/.mtn2git_empty create mode 100644 packages/jamvm/jamvm/heap-size.patch diff --git a/packages/jamvm/jamvm-1.3.0/.mtn2git_empty b/packages/jamvm/jamvm-1.3.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/jamvm/jamvm-1.3.0/heap-size.patch b/packages/jamvm/jamvm-1.3.0/heap-size.patch deleted file mode 100644 index 36d681889d..0000000000 --- a/packages/jamvm/jamvm-1.3.0/heap-size.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- jamvm-1.3.0/src/jam.h.orig 2005-04-02 14:38:49.000000000 +0200 -+++ jamvm-1.3.0/src/jam.h 2005-04-02 14:41:18.000000000 +0200 -@@ -531,13 +531,19 @@ - #define MIN_STACK 2*KB - - /* default minimum size of object heap */ -+#ifndef DEFAULT_MIN_HEAP - #define DEFAULT_MIN_HEAP 2*MB -+#endif - - /* default maximum size of object heap */ -+#ifndef DEFAULT_MAX_HEAP - #define DEFAULT_MAX_HEAP 128*MB -+#endif - - /* default size of the Java stack */ -+#ifndef DEFAULT_STACK - #define DEFAULT_STACK 64*KB -+#endif - - /* size of emergency area - big enough to create - a StackOverflow exception */ diff --git a/packages/jamvm/jamvm/.mtn2git_empty b/packages/jamvm/jamvm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/jamvm/jamvm/heap-size.patch b/packages/jamvm/jamvm/heap-size.patch new file mode 100644 index 0000000000..36d681889d --- /dev/null +++ b/packages/jamvm/jamvm/heap-size.patch @@ -0,0 +1,22 @@ +--- jamvm-1.3.0/src/jam.h.orig 2005-04-02 14:38:49.000000000 +0200 ++++ jamvm-1.3.0/src/jam.h 2005-04-02 14:41:18.000000000 +0200 +@@ -531,13 +531,19 @@ + #define MIN_STACK 2*KB + + /* default minimum size of object heap */ ++#ifndef DEFAULT_MIN_HEAP + #define DEFAULT_MIN_HEAP 2*MB ++#endif + + /* default maximum size of object heap */ ++#ifndef DEFAULT_MAX_HEAP + #define DEFAULT_MAX_HEAP 128*MB ++#endif + + /* default size of the Java stack */ ++#ifndef DEFAULT_STACK + #define DEFAULT_STACK 64*KB ++#endif + + /* size of emergency area - big enough to create + a StackOverflow exception */ -- cgit v1.2.3 From 56386ea3614a7f14ccfa2052efe6b43048ee39c8 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 17 Jul 2005 21:50:32 +0000 Subject: disapproval of revision 815c5bbbed38e5cb537b9d7103dfcafe0689861b --- packages/jamvm/jamvm-1.3.0/.mtn2git_empty | 0 packages/jamvm/jamvm-1.3.0/heap-size.patch | 22 ++++++++++++++++++++++ packages/jamvm/jamvm/.mtn2git_empty | 0 packages/jamvm/jamvm/heap-size.patch | 22 ---------------------- 4 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 packages/jamvm/jamvm-1.3.0/.mtn2git_empty create mode 100644 packages/jamvm/jamvm-1.3.0/heap-size.patch delete mode 100644 packages/jamvm/jamvm/.mtn2git_empty delete mode 100644 packages/jamvm/jamvm/heap-size.patch diff --git a/packages/jamvm/jamvm-1.3.0/.mtn2git_empty b/packages/jamvm/jamvm-1.3.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/jamvm/jamvm-1.3.0/heap-size.patch b/packages/jamvm/jamvm-1.3.0/heap-size.patch new file mode 100644 index 0000000000..36d681889d --- /dev/null +++ b/packages/jamvm/jamvm-1.3.0/heap-size.patch @@ -0,0 +1,22 @@ +--- jamvm-1.3.0/src/jam.h.orig 2005-04-02 14:38:49.000000000 +0200 ++++ jamvm-1.3.0/src/jam.h 2005-04-02 14:41:18.000000000 +0200 +@@ -531,13 +531,19 @@ + #define MIN_STACK 2*KB + + /* default minimum size of object heap */ ++#ifndef DEFAULT_MIN_HEAP + #define DEFAULT_MIN_HEAP 2*MB ++#endif + + /* default maximum size of object heap */ ++#ifndef DEFAULT_MAX_HEAP + #define DEFAULT_MAX_HEAP 128*MB ++#endif + + /* default size of the Java stack */ ++#ifndef DEFAULT_STACK + #define DEFAULT_STACK 64*KB ++#endif + + /* size of emergency area - big enough to create + a StackOverflow exception */ diff --git a/packages/jamvm/jamvm/.mtn2git_empty b/packages/jamvm/jamvm/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/jamvm/jamvm/heap-size.patch b/packages/jamvm/jamvm/heap-size.patch deleted file mode 100644 index 36d681889d..0000000000 --- a/packages/jamvm/jamvm/heap-size.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- jamvm-1.3.0/src/jam.h.orig 2005-04-02 14:38:49.000000000 +0200 -+++ jamvm-1.3.0/src/jam.h 2005-04-02 14:41:18.000000000 +0200 -@@ -531,13 +531,19 @@ - #define MIN_STACK 2*KB - - /* default minimum size of object heap */ -+#ifndef DEFAULT_MIN_HEAP - #define DEFAULT_MIN_HEAP 2*MB -+#endif - - /* default maximum size of object heap */ -+#ifndef DEFAULT_MAX_HEAP - #define DEFAULT_MAX_HEAP 128*MB -+#endif - - /* default size of the Java stack */ -+#ifndef DEFAULT_STACK - #define DEFAULT_STACK 64*KB -+#endif - - /* size of emergency area - big enough to create - a StackOverflow exception */ -- cgit v1.2.3 From 9539c315e63a84a7e66695d65140a33748ed3653 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 17 Jul 2005 21:58:41 +0000 Subject: jamvm: upgrade to 1.3.1 --- packages/jamvm/jamvm-1.3.1/.mtn2git_empty | 0 packages/jamvm/jamvm-1.3.1/size-defaults.patch | 12 ++++++++++++ packages/jamvm/jamvm_1.3.1.bb | 22 ++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 packages/jamvm/jamvm-1.3.1/.mtn2git_empty create mode 100644 packages/jamvm/jamvm-1.3.1/size-defaults.patch create mode 100644 packages/jamvm/jamvm_1.3.1.bb diff --git a/packages/jamvm/jamvm-1.3.1/.mtn2git_empty b/packages/jamvm/jamvm-1.3.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/jamvm/jamvm-1.3.1/size-defaults.patch b/packages/jamvm/jamvm-1.3.1/size-defaults.patch new file mode 100644 index 0000000000..a41beee982 --- /dev/null +++ b/packages/jamvm/jamvm-1.3.1/size-defaults.patch @@ -0,0 +1,12 @@ +--- jamvm-1.3.1.orig/src/jam.h 2005-07-17 23:53:34.000000000 +0200 ++++ jamvm-1.3.1/src/jam.h 2005-07-17 23:54:17.000000000 +0200 +@@ -548,7 +548,9 @@ + #endif + + /* default size of the Java stack */ ++#ifndef DEFAULT_STACK + #define DEFAULT_STACK 64*KB ++#endif + + /* size of emergency area - big enough to create + a StackOverflow exception */ diff --git a/packages/jamvm/jamvm_1.3.1.bb b/packages/jamvm/jamvm_1.3.1.bb new file mode 100644 index 0000000000..f33745d788 --- /dev/null +++ b/packages/jamvm/jamvm_1.3.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2." +HOMEPAGE = "http://jamvm.sourceforge.net/" +LICENSE = "GPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner " +SECTION = "interpreters" + +DEPENDS = "zlib classpath" +RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \ + file://size-defaults.patch;patch=1" + +inherit autotools update-alternatives + +EXTRA_OECONF = "--with-classpath-install-dir=${prefix}" +CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB" + +PROVIDES = "virtual/java" +ALTERNATIVE_NAME = "java" +ALTERNATIVE_PATH = "${bindir}/jamvm" +ALTERNATIVE_PRIORITY = "10" -- cgit v1.2.3 From b4c6b653d6e9ea0cdcdc32837421593863b16141 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Sun, 17 Jul 2005 23:31:16 +0000 Subject: upgrade gmp to 4.1.4: old version did not build with gcc4 --- packages/gmp/gmp-4.1.4/.mtn2git_empty | 0 packages/gmp/gmp-4.1.4/amd64.patch | 14 + packages/gmp/gmp-4.1.4/configure.patch | 837 +++++++++++++++++++++++++++++++++ packages/gmp/gmp_4.1.4.bb | 17 + 4 files changed, 868 insertions(+) create mode 100644 packages/gmp/gmp-4.1.4/.mtn2git_empty create mode 100644 packages/gmp/gmp-4.1.4/amd64.patch create mode 100644 packages/gmp/gmp-4.1.4/configure.patch create mode 100644 packages/gmp/gmp_4.1.4.bb diff --git a/packages/gmp/gmp-4.1.4/.mtn2git_empty b/packages/gmp/gmp-4.1.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gmp/gmp-4.1.4/amd64.patch b/packages/gmp/gmp-4.1.4/amd64.patch new file mode 100644 index 0000000000..67be9dd350 --- /dev/null +++ b/packages/gmp/gmp-4.1.4/amd64.patch @@ -0,0 +1,14 @@ +--- gmp-4.1.4/longlong.h.orig 2004-04-22 00:34:28.000000000 +0200 ++++ gmp-4.1.4/longlong.h 2005-07-18 01:13:06.000000000 +0200 +@@ -738,8 +738,10 @@ + count is only an int. */ + #define count_trailing_zeros(count, x) \ + do { \ ++ UDItype __cbtmp; \ + ASSERT ((x) != 0); \ +- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \ ++ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ ++ (count) = __cbtmp; \ + } while (0) + #endif /* x86_64 */ + diff --git a/packages/gmp/gmp-4.1.4/configure.patch b/packages/gmp/gmp-4.1.4/configure.patch new file mode 100644 index 0000000000..4b6c4ec636 --- /dev/null +++ b/packages/gmp/gmp-4.1.4/configure.patch @@ -0,0 +1,837 @@ +--- gmp-1.4.4/acinclude.m4.orig 2004-09-21 15:03:09.000000000 +0200 ++++ gmp-1.4.4/acinclude.m4 2005-07-18 01:09:00.000000000 +0200 +@@ -21,10 +21,10 @@ + dnl MA 02111-1307, USA. + + +-define(X86_PATTERN, ++define([X86_PATTERN], + [[i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-*]]) + +-define(POWERPC64_PATTERN, ++define([POWERPC64_PATTERN], + [[powerpc64-*-* | powerpc64le-*-* | powerpc620-*-* | powerpc630-*-*]]) + + +@@ -32,7 +32,7 @@ + dnl ---------------------- + dnl Strip entries */subdir from $path. + +-define(GMP_STRIP_PATH, ++define([GMP_STRIP_PATH], + [tmp_path= + for i in $path; do + case $i in +@@ -53,7 +53,7 @@ + dnl GMP_INCLUDE_GMP_H_BITS_PER_MP_LIMB starts as a dummy, but gets + dnl redefined in GMP_C_SIZES when the right value is known. + +-define(GMP_INCLUDE_GMP_H, ++define([GMP_INCLUDE_GMP_H], + [[#define __GMP_WITHIN_CONFIGURE 1 /* ignore template stuff */ + #define GMP_NAIL_BITS $GMP_NAIL_BITS] + GMP_INCLUDE_GMP_H_BITS_PER_MP_LIMB +@@ -61,7 +61,7 @@ + #include "$srcdir/gmp-h.in"] + ]) + +-define(GMP_INCLUDE_GMP_H_BITS_PER_MP_LIMB, ++define([GMP_INCLUDE_GMP_H_BITS_PER_MP_LIMB], + [[#define __GMP_BITS_PER_MP_LIMB 123 /* dummy for GMP_NUMB_BITS etc */ + #define GMP_LIMB_BITS 123]]) + +@@ -72,7 +72,7 @@ + dnl FILE. The regexps here aren't very rugged, but are enough for gmp. + dnl /dev/null as a parameter prevents a hang if $2 is accidentally omitted. + +-define(GMP_HEADER_GETVAL, ++define([GMP_HEADER_GETVAL], + [patsubst(patsubst( + esyscmd([grep "^#define $1 " $2 /dev/null 2>/dev/null]), + [^.*$1[ ]+],[]), +@@ -86,7 +86,7 @@ + dnl autoconf time. Two digits like 3.0 if patchlevel <= 0, or three digits + dnl like 3.0.1 if patchlevel > 0. + +-define(GMP_VERSION, ++define([GMP_VERSION], + [GMP_HEADER_GETVAL(__GNU_MP_VERSION,gmp-h.in)[]dnl + .GMP_HEADER_GETVAL(__GNU_MP_VERSION_MINOR,gmp-h.in)[]dnl + ifelse(m4_eval(GMP_HEADER_GETVAL(__GNU_MP_VERSION_PATCHLEVEL,gmp-h.in) > 0),1, +@@ -97,13 +97,13 @@ + dnl ------------------------------ + dnl Setup an AC_SUBST of HAVE_FUNC_01 for each argument. + +-AC_DEFUN(GMP_SUBST_CHECK_FUNCS, ++AC_DEFUN([GMP_SUBST_CHECK_FUNCS], + [m4_if([$1],,, + [_GMP_SUBST_CHECK_FUNCS(ac_cv_func_[$1],HAVE_[]m4_translit([$1],[a-z],[A-Z])_01) + GMP_SUBST_CHECK_FUNCS(m4_shift($@))])]) + + dnl Called: _GMP_SUBST_CHECK_FUNCS(cachvar,substvar) +-AC_DEFUN(_GMP_SUBST_CHECK_FUNCS, ++AC_DEFUN([_GMP_SUBST_CHECK_FUNCS], + [case $[$1] in + yes) AC_SUBST([$2],1) ;; + no) [$2]=0 ;; +@@ -115,14 +115,14 @@ + dnl ---------------------------------- + dnl Setup an AC_SUBST of HAVE_FOO_H_01 for each argument. + +-AC_DEFUN(GMP_SUBST_CHECK_HEADERS, ++AC_DEFUN([GMP_SUBST_CHECK_HEADERS], + [m4_if([$1],,, + [_GMP_SUBST_CHECK_HEADERS(ac_cv_header_[]m4_translit([$1],[./],[__]), + HAVE_[]m4_translit([$1],[a-z./],[A-Z__])_01) + GMP_SUBST_CHECK_HEADERS(m4_shift($@))])]) + + dnl Called: _GMP_SUBST_CHECK_HEADERS(cachvar,substvar) +-AC_DEFUN(_GMP_SUBST_CHECK_HEADERS, ++AC_DEFUN([_GMP_SUBST_CHECK_HEADERS], + [case $[$1] in + yes) AC_SUBST([$2],1) ;; + no) [$2]=0 ;; +@@ -145,12 +145,12 @@ + dnl would test whether $major.$minor.$subminor is greater than or equal to + dnl 10.3.1. + +-AC_DEFUN(GMP_COMPARE_GE, ++AC_DEFUN([GMP_COMPARE_GE], + [gmp_compare_ge=no + GMP_COMPARE_GE_INTERNAL($@) + ]) + +-AC_DEFUN(GMP_COMPARE_GE_INTERNAL, ++AC_DEFUN([GMP_COMPARE_GE_INTERNAL], + [ifelse(len([$3]),0, + [if test -n "$1" && test "$1" -ge $2; then + gmp_compare_ge=yes +@@ -184,7 +184,7 @@ + dnl for instance to random.o (and others) on vax-dec-ultrix4.5. Naturally + dnl a user-selected $AR_FLAGS is left unchanged. + +-AC_DEFUN(GMP_PROG_AR, ++AC_DEFUN([GMP_PROG_AR], + [dnl Want to establish $AR before libtool initialization. + AC_BEFORE([$0],[AC_PROG_LIBTOOL]) + gmp_user_AR=$AR +@@ -212,7 +212,7 @@ + dnl CC_FOR_BUILD is used without testing. CC_FOR_BUILD is the new name for + dnl a build system compiler, see configfsf.guess. + +-AC_DEFUN(GMP_PROG_HOST_CC, ++AC_DEFUN([GMP_PROG_HOST_CC], + [AC_BEFORE([$0],[AC_PROG_LIBTOOL]) + AC_REQUIRE([AC_PROG_CC]) + AC_CACHE_CHECK([for HOST_CC build system compiler], +@@ -255,7 +255,7 @@ + dnl FIXME: This can be removed and just AM_PROG_LEX used, one that macro + dnl works properly. + +-AC_DEFUN(GMP_PROG_LEX, ++AC_DEFUN([GMP_PROG_LEX], + [AC_REQUIRE([AC_PROG_LEX]) + if test "$LEX" = :; then + LEX=${am_missing_run}flex +@@ -273,7 +273,7 @@ + dnl + dnl See mpn/asm-defs.m4 for details on the known bad m4s. + +-AC_DEFUN(GMP_PROG_M4, ++AC_DEFUN([GMP_PROG_M4], + [AC_ARG_VAR(M4,[m4 macro processor]) + AC_CACHE_CHECK([for suitable m4], + gmp_cv_prog_m4, +@@ -340,7 +340,7 @@ + dnl Enhancement: Maybe this could be in GMP_PROG_M4, and attempt to prefer + dnl an m4 with a working m4wrap, if it can be found. + +-AC_DEFUN(GMP_M4_M4WRAP_SPURIOUS, ++AC_DEFUN([GMP_M4_M4WRAP_SPURIOUS], + [AC_REQUIRE([GMP_PROG_M4]) + AC_CACHE_CHECK([if m4wrap produces spurious output], + gmp_cv_m4_m4wrap_spurious, +@@ -374,7 +374,7 @@ + dnl A user-selected $NM is always left unchanged. AC_PROG_NM is still run + dnl to get the "checking" message printed though. + +-AC_DEFUN(GMP_PROG_NM, ++AC_DEFUN([GMP_PROG_NM], + [dnl Make sure we're the first to call AC_PROG_NM, so our extra flags are + dnl used by everyone. + AC_BEFORE([$0],[AC_PROG_NM]) +@@ -426,7 +426,7 @@ + dnl will run is that a plain native "./configure" falls back on ABI=32, but + dnl ABI=64 is still available as a cross-compile. + +-AC_DEFUN(GMP_PROG_CC_WORKS, ++AC_DEFUN([GMP_PROG_CC_WORKS], + [AC_MSG_CHECKING([compiler $1]) + cat >conftest.c <conftest.c <