From 45430bc098ad2fcd875f12b950ea4e0cee93a9ce Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 30 Jul 2005 23:16:21 +0000 Subject: openambedded/packages/gmp_4.1.2: -Apply patch from #118 coursety gerwinin to fix compilation of gmp on more modern compilers (e.g. gcc4) --- packages/gmp/gmp-4.1.2/gcc-compile.patch | 72 ++++++++++++++++++++++++++++++++ packages/gmp/gmp_4.1.2.bb | 3 +- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 packages/gmp/gmp-4.1.2/gcc-compile.patch diff --git a/packages/gmp/gmp-4.1.2/gcc-compile.patch b/packages/gmp/gmp-4.1.2/gcc-compile.patch new file mode 100644 index 0000000000..4d880123e9 --- /dev/null +++ b/packages/gmp/gmp-4.1.2/gcc-compile.patch @@ -0,0 +1,72 @@ + diff -Naur gmp-4.1.2.orig/mpf/ceilfloor.c gmp-4.1.2/mpf/ceilfloor.c + --- gmp-4.1.2.orig/mpf/ceilfloor.c 2001-05-10 22:31:13.000000000 +0000 + +++ gmp-4.1.2/mpf/ceilfloor.c 2004-04-25 03:48:20.823016075 +0000 + @@ -31,7 +31,7 @@ + static void __gmpf_ceil_or_floor _PROTO ((REGPARM_2_1 (mpf_ptr r, mpf_srcptr u, int dir))) REGPARM_ATTR (1); + #define mpf_ceil_or_floor(r,u,dir) __gmpf_ceil_or_floor (REGPARM_2_1 (r, u, dir)) + + -static void + +REGPARM_ATTR (1) static void + mpf_ceil_or_floor (mpf_ptr r, mpf_srcptr u, int dir) + { + mp_ptr rp, up, p; + diff -Naur gmp-4.1.2.orig/mpq/aors.c gmp-4.1.2/mpq/aors.c + --- gmp-4.1.2.orig/mpq/aors.c 2001-09-01 22:41:02.000000000 +0000 + +++ gmp-4.1.2/mpq/aors.c 2004-04-25 03:48:20.826015531 +0000 + @@ -27,7 +27,7 @@ + static void __gmpq_aors _PROTO ((REGPARM_3_1 (mpq_ptr w, mpq_srcptr x, mpq_srcptr y, void (*fun) _PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr))))) REGPARM_ATTR (1); + #define mpq_aors(w,x,y,fun) __gmpq_aors (REGPARM_3_1 (w, x, y, fun)) + + -static void + +REGPARM_ATTR (1) static void + mpq_aors (mpq_ptr rop, mpq_srcptr op1, mpq_srcptr op2, + void (*fun) _PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr))) + { + diff -Naur gmp-4.1.2.orig/mpz/aorsmul.c gmp-4.1.2/mpz/aorsmul.c + --- gmp-4.1.2.orig/mpz/aorsmul.c 2001-05-02 22:30:07.000000000 +0000 + +++ gmp-4.1.2/mpz/aorsmul.c 2004-04-25 03:48:20.828015169 +0000 + @@ -39,7 +39,7 @@ + static void __gmpz_aorsmul _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub))) REGPARM_ATTR (1); + #define mpz_aorsmul(w,x,y,sub) __gmpz_aorsmul (REGPARM_3_1 (w, x, y, sub)) + + -static void + +REGPARM_ATTR (1) static void + mpz_aorsmul (mpz_ptr w, mpz_srcptr x, mpz_srcptr y, mp_size_t sub) + { + mp_size_t xsize, ysize, tsize, wsize, wsize_signed; + diff -Naur gmp-4.1.2.orig/mpz/aorsmul_i.c gmp-4.1.2/mpz/aorsmul_i.c + --- gmp-4.1.2.orig/mpz/aorsmul_i.c 2002-05-14 16:59:49.000000000 +0000 + +++ gmp-4.1.2/mpz/aorsmul_i.c 2004-04-25 03:49:07.962471904 +0000 + @@ -57,7 +57,7 @@ + twos-complement negative y doesn't work, because it effectively adds an + extra x * 2^BITS_PER_MP_LIMB. */ + + -void + +REGPARM_ATTR (1) void + mpz_aorsmul_1 (mpz_ptr w, mpz_srcptr x, mp_limb_t y, mp_size_t sub) + { + mp_size_t xsize, wsize, wsize_signed, new_wsize, min_size, dsize; + diff -Naur gmp-4.1.2.orig/mpz/cfdiv_q_2exp.c gmp-4.1.2/mpz/cfdiv_q_2exp.c + --- gmp-4.1.2.orig/mpz/cfdiv_q_2exp.c 2002-02-08 21:55:17.000000000 +0000 + +++ gmp-4.1.2/mpz/cfdiv_q_2exp.c 2004-04-25 03:48:20.830014806 +0000 + @@ -29,7 +29,7 @@ + static void __gmpz_cfdiv_q_2exp _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir))) REGPARM_ATTR (1); + #define cfdiv_q_2exp(w,u,cnt,dir) __gmpz_cfdiv_q_2exp (REGPARM_3_1 (w,u,cnt,dir)) + + -static void + +REGPARM_ATTR (1) static void + cfdiv_q_2exp (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir) + { + mp_size_t wsize, usize, abs_usize, limb_cnt, i; + diff -Naur gmp-4.1.2.orig/mpz/cfdiv_r_2exp.c gmp-4.1.2/mpz/cfdiv_r_2exp.c + --- gmp-4.1.2.orig/mpz/cfdiv_r_2exp.c 2002-04-18 16:48:25.000000000 +0000 + +++ gmp-4.1.2/mpz/cfdiv_r_2exp.c 2004-04-25 03:48:20.832014444 +0000 + @@ -32,7 +32,7 @@ + static void __gmpz_cfdiv_r_2exp _PROTO ((REGPARM_3_1 (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir))) REGPARM_ATTR (1); + #define cfdiv_r_2exp(w,u,cnt,dir) __gmpz_cfdiv_r_2exp (REGPARM_3_1 (w, u, cnt, dir)) + + -static void + +REGPARM_ATTR (1) static void + cfdiv_r_2exp (mpz_ptr w, mpz_srcptr u, unsigned long cnt, int dir) + { + mp_size_t usize, abs_usize, limb_cnt, i; diff --git a/packages/gmp/gmp_4.1.2.bb b/packages/gmp/gmp_4.1.2.bb index b19d122ddf..d7456175a1 100644 --- a/packages/gmp/gmp_4.1.2.bb +++ b/packages/gmp/gmp_4.1.2.bb @@ -5,7 +5,8 @@ LICENSE = "GPL LGPL" SRC_URI = "ftp://mirrors.kernel.org/gnu/gmp/gmp-${PV}.tar.gz \ file://configure.patch;patch=1 \ - file://amd64.patch;patch=1" + file://amd64.patch;patch=1 \ + file://gcc-compile.patch;patch=1 " inherit autotools -- cgit v1.2.3 From f04420fc3411246cd8d2d9e283f6e9073158901b Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 30 Jul 2005 23:29:35 +0000 Subject: openembedded/classes/tinderclient.bbclass: -timedelta in minutes not hours -tinder_start add the timedelta instead of subtracting it -Berlin is just 120 minutes away from UTC (60 + 60 from dst) -TINDER_TZ takes time in minutes --- classes/tinderclient.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 5b55589ec0..3c88b2ac63 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -5,21 +5,21 @@ def tinder_tz_offset(off): return int(off) except ValueError: if off == "Europe/Berlin": - return 200 + return 120 else: return 0 def tinder_tinder_time(offset): import datetime - td = datetime.timedelta(tinder_tz_offset(offset)) + td = datetime.timedelta(minutes=tinder_tz_offset(offset)) time = datetime.datetime.utcnow() + td return time.strftime('%m/%d/%Y %H:%M:%S') def tinder_tinder_start(date,offset): import datetime, time - td = datetime.timedelta(tinder_tz_offset(offset)) + td = datetime.timedelta(minutes=tinder_tz_offset(offset)) ti = time.strptime(date, "%m/%d/%Y %H:%M:%S") - ti = datetime.datetime(*ti[0:7])-td + time = datetime.datetime(*ti[0:7])+td return time.strftime('%m/%d/%Y %H:%M:%S') def tinder_send_email(da, header, log): -- cgit v1.2.3 From a1beb4cf035284afb8aa641aee559dfd9581c6fd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Jul 2005 11:43:28 +0000 Subject: update libbonobo to 2.10.0 --- packages/gnome/libbonobo/.mtn2git_empty | 0 packages/gnome/libbonobo/gtk-doc.m4 | 53 ++++++++++++ packages/gnome/libbonobo/gtk-doc.make | 148 ++++++++++++++++++++++++++++++++ packages/gnome/libbonobo_2.10.0.bb | 59 +++++++++++++ 4 files changed, 260 insertions(+) create mode 100644 packages/gnome/libbonobo/.mtn2git_empty create mode 100644 packages/gnome/libbonobo/gtk-doc.m4 create mode 100644 packages/gnome/libbonobo/gtk-doc.make create mode 100644 packages/gnome/libbonobo_2.10.0.bb diff --git a/packages/gnome/libbonobo/.mtn2git_empty b/packages/gnome/libbonobo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnome/libbonobo/gtk-doc.m4 b/packages/gnome/libbonobo/gtk-doc.m4 new file mode 100644 index 0000000000..3ec41666b2 --- /dev/null +++ b/packages/gnome/libbonobo/gtk-doc.m4 @@ -0,0 +1,53 @@ +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + dnl for overriding the documentation installation directory + AC_ARG_WITH(html-dir, + AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST(HTML_DIR) + + dnl enable/disable documentation building + AC_ARG_ENABLE(gtk-doc, + AC_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [default=no]]),, + enable_gtk_doc=no) + + have_gtk_doc=no + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then + have_gtk_doc=yes + fi + + dnl do we want to do a version check? +ifelse([$1],[],, + [gtk_doc_min_version=$1 + if test "$have_gtk_doc" = yes; then + AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) + if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + have_gtk_doc=no + fi + fi +]) + if test x$enable_gtk_doc = xyes; then + if test "$have_gtk_doc" != yes; then + enable_gtk_doc=no + fi + fi + + AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) + AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") +]) diff --git a/packages/gnome/libbonobo/gtk-doc.make b/packages/gnome/libbonobo/gtk-doc.make new file mode 100644 index 0000000000..c319e7ad7c --- /dev/null +++ b/packages/gnome/libbonobo/gtk-doc.make @@ -0,0 +1,148 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE).types \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) + @echo '*** Scanning header files ***' + @-chmod -R u+w $(srcdir) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo '*** Rebuilding template files ***' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml + @echo '*** Building XML ***' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo '*** Building HTML ***' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo '-- Fixing Crossreferences' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp +endif + +############## + +clean-local: + rm -f *~ *.bak + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) + (installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + fi) + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + -cp $(srcdir)/html/* $(distdir)/html + +.PHONY : dist-hook-local diff --git a/packages/gnome/libbonobo_2.10.0.bb b/packages/gnome/libbonobo_2.10.0.bb new file mode 100644 index 0000000000..bd51d4e45a --- /dev/null +++ b/packages/gnome/libbonobo_2.10.0.bb @@ -0,0 +1,59 @@ +LICENSE = "GPL" +PR = "r1" +SECTION = "x11/gnome/libs" +DESCRIPTION = "Bonobo CORBA interfaces library" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.10/libbonobo-${PV}.tar.bz2 \ + file://gtk-doc.m4 \ + file://gtk-doc.make" +DEPENDS = "glib-2.0 orbit2 intltool-native libxml2" +ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2" + +FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so" +FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \ + ${libdir}/bonobo-2.0/samples" + +inherit autotools pkgconfig + +PARALLEL_MAKE = "" + +do_configure_prepend() { + install -d m4 + install ${WORKDIR}/gtk-doc.m4 m4/ + install ${WORKDIR}/gtk-doc.make ./ +} + +ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \ + bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \ + bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \ + bonobo-activation-server-info.h bonobo-activation-version.h" + +BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \ + bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \ + bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \ + bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \ + bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \ + bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \ + bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h \ + bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \ + bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \ + bonobo-app-client.h bonobo-application.h" + +do_compile() { + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" +} + +do_stage() { + install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation + for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done + install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo + for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done + install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/ + install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ + install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ + oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR} + oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR} +} + +do_install() { + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install +} -- cgit v1.2.3 From 6fd90f17453aa70523815ff99fc96f0562786ad1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Jul 2005 11:49:13 +0000 Subject: update libgnome to 2.10.1 --- packages/gnome/libgnome_2.10.1.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packages/gnome/libgnome_2.10.1.bb diff --git a/packages/gnome/libgnome_2.10.1.bb b/packages/gnome/libgnome_2.10.1.bb new file mode 100644 index 0000000000..531fdd4240 --- /dev/null +++ b/packages/gnome/libgnome_2.10.1.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r1" + +inherit gnome + +DEPENDS = "gnome-vfs libbonobo" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + oe_libinstall -C libgnome -a -so libgnome-2 ${STAGING_LIBDIR} + gnome_stage_includes +} -- cgit v1.2.3 From 61da447493bf804fe07aed9a316227be70fc9051 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Jul 2005 12:46:42 +0000 Subject: update gnome-mime-data to 2.4.2 --- packages/gnome/gnome-mime-data_2.4.2.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/gnome/gnome-mime-data_2.4.2.bb diff --git a/packages/gnome/gnome-mime-data_2.4.2.bb b/packages/gnome/gnome-mime-data_2.4.2.bb new file mode 100644 index 0000000000..1a49ed8e72 --- /dev/null +++ b/packages/gnome/gnome-mime-data_2.4.2.bb @@ -0,0 +1,5 @@ +LICENSE = "GPL" +inherit gnome + +DEPENDS += "intltool-native" +PR = "r1" -- cgit v1.2.3 From 72f3abf7ebdd93ca6cfc8605951eb52d04b2fcf0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Jul 2005 12:54:02 +0000 Subject: Update libbonoboui and libgnomecanvas to 2.10.x --- packages/gnome/libbonoboui_2.10.0.bb | 57 +++++++++++++++++++++++++++++++++ packages/gnome/libgnomecanvas_2.10.2.bb | 16 +++++++++ 2 files changed, 73 insertions(+) create mode 100644 packages/gnome/libbonoboui_2.10.0.bb create mode 100644 packages/gnome/libgnomecanvas_2.10.2.bb diff --git a/packages/gnome/libbonoboui_2.10.0.bb b/packages/gnome/libbonoboui_2.10.0.bb new file mode 100644 index 0000000000..719fe2395a --- /dev/null +++ b/packages/gnome/libbonoboui_2.10.0.bb @@ -0,0 +1,57 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r1" + +inherit gnome pkgconfig + +FILES_${PN} += "${libdir}/libglade/2.0/*.so" +FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \ + ${libdir}/bonobo-2.0/samples" + +DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade" + +EXTRA_OECONF = "--disable-gtk-doc" + +HEADERS = " \ +bonobo/bonobo-zoomable.h \ +bonobo/bonobo-ui-component.h \ +bonobo/bonobo-dock-layout.h \ +bonobo/bonobo-ui-type-builtins.h \ +bonobo/bonobo-canvas-component.h \ +bonobo/bonobo-widget.h \ +bonobo/bonobo-ui-engine.h \ +bonobo/bonobo-window.h \ +bonobo/bonobo-ui-toolbar.h \ +bonobo/bonobo-dock-band.h \ +bonobo/bonobo-ui-toolbar-item.h \ +bonobo/bonobo-control.h \ +bonobo/bonobo-dock-item.h \ +bonobo/bonobo-ui-config-widget.h \ +bonobo/bonobo-zoomable-frame.h \ +bonobo/bonobo-control-frame.h \ +bonobo/bonobo-dock.h \ +bonobo/bonobo-ui-main.h \ +bonobo/bonobo-canvas-item.h \ +bonobo/bonobo-ui-node.h \ +bonobo/bonobo-socket.h \ +bonobo/bonobo-selector.h \ +bonobo/bonobo-ui-sync.h \ +bonobo/bonobo-ui-util.h \ +bonobo/bonobo-plug.h \ +bonobo/bonobo-ui-toolbar-button-item.h \ +bonobo/bonobo-ui-toolbar-toggle-button-item.h \ +bonobo/bonobo-ui-container.h \ +bonobo/bonobo-file-selector-util.h \ +bonobo/bonobo-property-control.h \ +bonobo/bonobo-selector-widget.h \ +libbonoboui.h \ +bonobo.h \ +" + +do_stage() { + install -d ${STAGING_INCDIR}/libbonoboui-2.0/bonobo + for i in ${HEADERS}; do + install -m 0644 $i ${STAGING_INCDIR}/libbonoboui-2.0/$i + done + oe_libinstall -C bonobo -a -so libbonoboui-2 ${STAGING_LIBDIR} +} diff --git a/packages/gnome/libgnomecanvas_2.10.2.bb b/packages/gnome/libgnomecanvas_2.10.2.bb new file mode 100644 index 0000000000..36ee1aa67f --- /dev/null +++ b/packages/gnome/libgnomecanvas_2.10.2.bb @@ -0,0 +1,16 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r1" +DESCRIPTION = "A powerful object-oriented display" +inherit gnome + +DEPENDS = "gnome-vfs libbonobo libglade libart-lgpl" + +EXTRA_OECONF = "--disable-gtk-doc" + +FILES_${PN} += "${libdir}/libglade/*/libcanvas.so" + +do_stage() { + gnome_stage_includes + oe_libinstall -C libgnomecanvas -a -so libgnomecanvas-2 ${STAGING_LIBDIR} +} -- cgit v1.2.3 From 1424698cf684f86dcb08797909f3bd63eee42935 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 29 Jul 2005 09:57:46 +0000 Subject: Added the missing-exports patch from Matta to the OpenSlug kernel, to resolve the missing hotplug_path and add_input_randomness symbols. --- .../linux/nslu2-kernel/2.6.12/missing-exports.patch | 19 +++++++++++++++++++ packages/linux/nslu2-kernel_2.6.12.2.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 packages/linux/nslu2-kernel/2.6.12/missing-exports.patch diff --git a/packages/linux/nslu2-kernel/2.6.12/missing-exports.patch b/packages/linux/nslu2-kernel/2.6.12/missing-exports.patch new file mode 100644 index 0000000000..935dd29115 --- /dev/null +++ b/packages/linux/nslu2-kernel/2.6.12/missing-exports.patch @@ -0,0 +1,19 @@ +--- linux-2.6.12/drivers/char/random.c~ 2005-05-14 16:42:24.000000000 -0400 ++++ linux-2.6.12/drivers/char/random.c 2005-05-14 16:42:46.000000000 -0400 +@@ -646,6 +646,7 @@ extern void add_input_randomness(unsigne + add_timer_randomness(&input_timer_state, + (type << 4) ^ code ^ (code >> 4) ^ value); + } ++EXPORT_SYMBOL_GPL(add_input_randomness); + + void add_interrupt_randomness(int irq) + { +--- linux-2.6.12/lib/kobject_uevent.c~ 2005-05-14 16:45:13.000000000 -0400 ++++ linux-2.6.12/lib/kobject_uevent.c 2005-05-14 16:45:27.000000000 -0400 +@@ -178,6 +178,7 @@ static inline int send_uevent(const char + + #ifdef CONFIG_HOTPLUG + char hotplug_path[HOTPLUG_PATH_LEN] = "/sbin/hotplug"; ++EXPORT_SYMBOL_GPL(hotplug_path); + u64 hotplug_seqnum; + static DEFINE_SPINLOCK(sequence_lock); diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index e87b612172..8b54cdc703 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 = "r5" +PR = "r6" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include @@ -21,4 +21,5 @@ N2K_PATCHES = "\ file://xscale-reset.patch;patch=1 \ file://x1205-rtc.c-id.patch;patch=1 \ file://mtd-shutdown.patch;patch=1 \ + file://missing-exports.patch;patch=1 \ " -- cgit v1.2.3 From 5c9a37fc214155aa1bb8deaf2ffa663db138cf82 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 30 Jul 2005 15:48:13 +0000 Subject: Fix the location of one of the patches not to use the unreliable sourceforge mirrors. There should be no change to the module, however the precise way the patches are applied has changed, so the PR has been bumped. --- packages/ixp425-eth/ixp425-eth_1.1.bb | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index 9225cb3df7..a8be7757c3 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -2,12 +2,13 @@ DEPENDS = "ixp4xx-csr patcher-native" LICENSE = "GPL" MAINTAINER = "Chris Larson " SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPatch-1_1.zip \ + http://nslu.sourceforge.net/downloads/ixp425_eth.c.patch \ file://makefile.patch;patch=1 \ file://ethhdr.patch;patch=1 \ file://intdriven.patch;patch=1 \ file://pollcontroller.patch;patch=1 \ file://mm4.patch;patch=1" -PR = "r5" +PR = "r6" S = "${WORKDIR}" @@ -21,15 +22,15 @@ inherit module KERNEL_CC += "${TARGET_CC_ARCH} -mno-thumb-interwork" # KERNEL_LD += -do_ixp425_c_patch_fetch () { - if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then - cd ${DL_DIR} - wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193 - md5sum > ixp425_eth.c.patch.md5 - fi -} - -addtask ixp425_c_patch_fetch after do_fetch before do_unpack +#do_ixp425_c_patch_fetch () { +# if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then +# cd ${DL_DIR} +# wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193 +# md5sum > ixp425_eth.c.patch.md5 +# fi +#} +# +#addtask ixp425_c_patch_fetch after do_fetch before do_unpack do_ixp425_c_patch_unpack () { install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/ -- cgit v1.2.3 From 3d97034fa59463df76195e5845189fc6d1e10933 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 30 Jul 2005 17:38:13 +0000 Subject: Copy over source location changes from OpenSlug-2.3-beta --- packages/nis/pwdutils_2.6.bb | 2 ++ packages/nis/ypbind-mt_1.18.bb | 2 ++ packages/nis/ypserv_2.17.bb | 2 ++ 3 files changed, 6 insertions(+) diff --git a/packages/nis/pwdutils_2.6.bb b/packages/nis/pwdutils_2.6.bb index 4ba89ffb23..4db798c151 100644 --- a/packages/nis/pwdutils_2.6.bb +++ b/packages/nis/pwdutils_2.6.bb @@ -12,6 +12,8 @@ HOMEPAGE="http://lists.suse.com/archive/pwdutils/" include nis.inc +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" + # an selinux API is used even if no selinux is detected by # configure. SRC_URI += " file://no-selinux.patch;patch=1" diff --git a/packages/nis/ypbind-mt_1.18.bb b/packages/nis/ypbind-mt_1.18.bb index e58daa6670..fb6b0b3621 100644 --- a/packages/nis/ypbind-mt_1.18.bb +++ b/packages/nis/ypbind-mt_1.18.bb @@ -16,6 +16,8 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html" include nis.inc +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" + # ypbind-mt now provides all the functionality of ypbind # and is used in place of it. PROVIDES += "ypbind" diff --git a/packages/nis/ypserv_2.17.bb b/packages/nis/ypserv_2.17.bb index 6edb534e8f..c6c564bd50 100644 --- a/packages/nis/ypserv_2.17.bb +++ b/packages/nis/ypserv_2.17.bb @@ -7,6 +7,8 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypserv/index.html" include nis.inc +SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2" + # ypserv needs a database package, gdbm is currently the # only candidate DEPENDS += " gdbm" -- cgit v1.2.3 From 52b0b44449952398e59147730e3fae6c8d2f0508 Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Sat, 30 Jul 2005 20:34:12 +0000 Subject: Update to follow the FHS and use update-alternatives for gzip, gunzip and zcat --- packages/gzip/gzip_1.3.5.bb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/packages/gzip/gzip_1.3.5.bb b/packages/gzip/gzip_1.3.5.bb index e99c76dcb4..a138221367 100644 --- a/packages/gzip/gzip_1.3.5.bb +++ b/packages/gzip/gzip_1.3.5.bb @@ -5,6 +5,7 @@ MAINTAINER = "Greg Gilbert " DESCRIPTION = "gzip (GNU zip) is a compression utility designed \ to be a replacement for 'compress'. The GNU Project uses it as \ the standard compression program for its system." +PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \ file://configure.patch;patch=1" @@ -12,3 +13,25 @@ SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \ S = "${WORKDIR}/gzip-${PV}" inherit autotools + +do_install () { + autotools_do_install + # Rename and move files into /bin (FHS) + install -d ${D}${base_bindir} + mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN} + mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN} + mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100 + update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100 + update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove gunzip gunzip.${PN} + update-alternatives --remove gzip gzip.${PN} + update-alternatives --remove zcat zcat.${PN} +} + -- cgit v1.2.3 From 1e01ba191c1bb6d550ddfd76891c16f308eee92b Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Sat, 30 Jul 2005 20:35:30 +0000 Subject: Add gzip to openslug-native --- packages/meta/openslug-native.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb index d61815eb6a..bb5a68d01e 100644 --- a/packages/meta/openslug-native.bb +++ b/packages/meta/openslug-native.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Packages that are required for the OpenSlug native build environment" LICENSE = MIT -PR = "r6" +PR = "r7" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 @@ -21,6 +21,7 @@ OPENSLUG_NATIVE = "\ gcc gcc-symlinks \ glibc-extra-nss glibc-utils \ gnu-config \ + gzip \ libc6 libc6-dev \ libg2c-dev \ libgdbm3 \ -- cgit v1.2.3 From c45f447280a8d47bc00517133d018e0bdc93c10e Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 30 Jul 2005 20:48:48 +0000 Subject: Disable all the sgml documentation building - this should fix both 186 and 228 since both fail (with different toolsets) during the documentation build. --- packages/pam/libpam_0.79.bb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/pam/libpam_0.79.bb b/packages/pam/libpam_0.79.bb index 8907d9762a..b2fb9deb8f 100644 --- a/packages/pam/libpam_0.79.bb +++ b/packages/pam/libpam_0.79.bb @@ -19,6 +19,7 @@ MAINTAINER = "John Bowler " SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL-2" +PR = "r1" # The project is actually called Linux-PAM but that gives # a bad OE package name because of the upper case characters @@ -37,6 +38,14 @@ SRC_URI += " file://libpam-make.patch;patch=1" inherit autotools # EXTRA_OECONF += " --enable-static-libpam" +# Disable building of the documentation - it requires too many different +# programs installed on the build system and is a waste of time. This +# leaves the man documentation in the build. +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2TXT=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2HTML=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2LATEX=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_PS2PDF=no" +EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2PS=no" LEAD_SONAME = "libpam.so.*" -- cgit v1.2.3 From 0f23819ddca7eb0894efb2a85f4a4f39bd48c617 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 30 Jul 2005 20:58:31 +0000 Subject: disapproval of revision 5a8e09b9c4fd282e81e1644641d99f38fcfd0708 --- packages/at76c503a/at76c503a-modules/.mtn2git_empty | 0 packages/at76c503a/at76c503a-modules/makefile.cc.patch | 11 ----------- packages/at76c503a/at76c503a-modules_cvs.bb | 7 +++---- 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 packages/at76c503a/at76c503a-modules/.mtn2git_empty delete mode 100644 packages/at76c503a/at76c503a-modules/makefile.cc.patch diff --git a/packages/at76c503a/at76c503a-modules/.mtn2git_empty b/packages/at76c503a/at76c503a-modules/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/at76c503a/at76c503a-modules/makefile.cc.patch b/packages/at76c503a/at76c503a-modules/makefile.cc.patch deleted file mode 100644 index c7a41990d3..0000000000 --- a/packages/at76c503a/at76c503a-modules/makefile.cc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- at76c503a/Makefile.old 2005-07-29 21:57:34.000000000 +0200 -+++ at76c503a/Makefile 2005-07-29 21:57:43.000000000 +0200 -@@ -9,7 +9,7 @@ - # the License, or (at your option) any later version. - # - --CC=gcc -+#CC=gcc - - ifneq (,$(KVERS)) - KERNEL_VERSION=$(KVERS) diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb index 8f11aeeff3..9673e5fb1b 100644 --- a/packages/at76c503a/at76c503a-modules_cvs.bb +++ b/packages/at76c503a/at76c503a-modules_cvs.bb @@ -1,15 +1,14 @@ SECTION = "base" LICENSE = "GPL" -SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \ - file://makefile.cc.patch;patch=1" +SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a" S = "${WORKDIR}/at76c503a" PR = "r1" PV = "0.0cvs${CVSDATE}" inherit module -MODULES = "at76c503.ko at76_usbdfu.ko at76c503-i3861.ko at76c503-rfmd.ko at76c503-rfmd-acc.ko \ - at76c505-rfmd.ko at76c503-i3863.ko at76c505-rfmd2958.ko" +MODULES = "at76c503.o at76_usbdfu.o at76c503-i3861.o at76c503-rfmd.o at76c503-rfmd-acc.o \ + at76c505-rfmd.o at76c503-i3863.o at76c505-rfmd2958.o" pkg_postinst() { #!/bin/sh -- cgit v1.2.3 From 6efb65bd45011299a3a734b18c0feb059196f627 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 30 Jul 2005 21:08:07 +0000 Subject: Add OPENSLUG_EXTRA_BBFILES to the BBFILES in conf/distro/openslug-packages.conf This allows extra package directories to be added (or even individual files) without affecting the operation of bb freeze and bb unfreeze. Note that new versions of openslug-packages.conf should keep the addition at the end but that freeze output will not have it. --- conf/distro/openslug-packages.conf | 2 +- conf/distro/openslug.conf | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 5972afdbf0..11b778db9f 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -157,4 +157,4 @@ ${PKGDIR}/packages/vlan/*.bb \ ${PKGDIR}/packages/wget/*.bb \ ${PKGDIR}/packages/xinetd/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ -" +${OPENSLUG_EXTRA_BBFILES}" diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index dd4d7c0b5b..2d1540333f 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -36,6 +36,10 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE OPENSLUG_EXTRA_DEPENDS ?= "e2fsprogs reiserfsprogs upslug-native lrzsz" +# NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to +# the .bb files for the packages to build - see openslug-packages.conf in this +# directory + # CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided # to enable/disable debugging in the distro. Here noirqdebug is used to # remove the messages about unhandled interrupts - people debugging interrupt -- cgit v1.2.3 From 159fa0a44ce001a4cf96a940830c2ad28252ba2f Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Sat, 30 Jul 2005 21:18:47 +0000 Subject: Change startperl from #!hostperl to #!/usr/bin/perl so that the perl utilities like cpan works --- packages/perl/perl-5.8.7/config.sh-arm-linux.patch | 9 --------- packages/perl/perl-5.8.7/config.sh-armeb-linux | 2 +- packages/perl/perl-5.8.7/config.sh-i686-linux | 2 +- packages/perl/perl_5.8.7.bb | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch index 0f56601b8b..0181e37c95 100644 --- a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch +++ b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch @@ -24,15 +24,6 @@ pg='pg' phostname='hostname' pidtype='pid_t' -@@ -906,7 +907,7 @@ - srandom_r_proto='0' - src='.' - ssizetype='ssize_t' --startperl='#!/usr/bin/perl' -+startperl='#!hostperl' - startsh='#!/bin/sh' - static_ext=' ' - stdchar='char' @@ -971,6 +972,7 @@ usereentrant='undef' usesfio='false' diff --git a/packages/perl/perl-5.8.7/config.sh-armeb-linux b/packages/perl/perl-5.8.7/config.sh-armeb-linux index 3c5adaf70b..155b5237aa 100644 --- a/packages/perl/perl-5.8.7/config.sh-armeb-linux +++ b/packages/perl/perl-5.8.7/config.sh-armeb-linux @@ -907,7 +907,7 @@ srand48_r_proto='0' srandom_r_proto='0' src='.' ssizetype='ssize_t' -startperl='#!hostperl' +startperl='#!/usr/bin/perl' startsh='#!/bin/sh' static_ext=' ' stdchar='char' diff --git a/packages/perl/perl-5.8.7/config.sh-i686-linux b/packages/perl/perl-5.8.7/config.sh-i686-linux index b09b7140e7..313ff2fbb1 100644 --- a/packages/perl/perl-5.8.7/config.sh-i686-linux +++ b/packages/perl/perl-5.8.7/config.sh-i686-linux @@ -905,7 +905,7 @@ srand48_r_proto='0' srandom_r_proto='0' src='.' ssizetype='ssize_t' -startperl='#!hostperl' +startperl='#!/usr/bin/perl' startsh='#!/bin/sh' static_ext=' ' stdchar='char' diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 7d79105065..551bb7b44d 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -4,7 +4,7 @@ include perl.inc SRC_URI += "file://config.sh-armeb-linux" -PR = "r7" +PR = "r8" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl -- cgit v1.2.3 From 4e4bfc091034459785dc58643f8a58eab5b011eb Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Sat, 30 Jul 2005 22:06:26 +0000 Subject: Remove ${D} from the install paths in Config_heavy.pl so that cpan knows the correct path to install things in, Closes: OE-Bug#7 --- packages/perl/perl_5.8.7.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index 551bb7b44d..babeea3e9a 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -4,7 +4,7 @@ include perl.inc SRC_URI += "file://config.sh-armeb-linux" -PR = "r8" +PR = "r9" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl @@ -30,6 +30,7 @@ do_configure() { do_install_append() { ln -s libperl.so.${PV} ${D}/${libdir}/libperl.so.5 + sed -i -e "s,${D},,g" ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/Config_heavy.pl } # Create a perl-modules package recommending all the other perl -- cgit v1.2.3 From 061ac449d09f9e7d75f4fef3fe6c053ea7c00677 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 30 Jul 2005 23:54:30 +0000 Subject: Remove error message when OPENSLUG_EXTRA_BBFILES is not defined. --- conf/distro/openslug.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 2d1540333f..4c22206a49 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -39,6 +39,7 @@ OPENSLUG_EXTRA_DEPENDS ?= "e2fsprogs reiserfsprogs upslug-native lrzsz" # NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to # the .bb files for the packages to build - see openslug-packages.conf in this # directory +OPENSLUG_EXTRA_BBFILES ?= "" # CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided # to enable/disable debugging in the distro. Here noirqdebug is used to -- cgit v1.2.3 From dcdd7c50d560dab19133a25afa01d7f9af0d64e3 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Sun, 31 Jul 2005 13:00:50 +0000 Subject: Migrate per package configuration files in drop in directory. --- .../initscripts-1.0/populate-volatile.sh | 168 +++++++++++++++------ packages/initscripts/initscripts-openslug_1.0.bb | 4 +- packages/initscripts/initscripts_1.0.bb | 7 +- 3 files changed, 127 insertions(+), 52 deletions(-) diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index 311a2764da..99a469d576 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -1,64 +1,138 @@ #!/bin/sh . /etc/default/rcS -CFGFILE="/etc/default/volatiles" + +CFGDIR="/etc/default/volatiles" +TMPROOT="/var/tmp" +COREDEF="00_core" [ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems." -cat ${CFGFILE} | grep -v "^#" | \ -while read LINE; do - TTYPE=`echo ${LINE} | cut -d " " -f 1` - TUSER=`echo ${LINE} | cut -d " " -f 2` - TGROUP=`echo ${LINE} | cut -d " " -f 3` - TMODE=`echo ${LINE} | cut -d " " -f 4` - TNAME=`echo ${LINE} | cut -d " " -f 5` - [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-." +check_requirements() { - [ "${TTYPE}" = "l" ] && { - [ -e "${TNAME}" ] && { - echo "Cannot create link over existing -${TNAME}-." >&2 - } || { - TSOURCE=`echo ${LINE} | cut -d " " -f 6` - [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-." - ln -s "${TSOURCE}" "${TNAME}" - } - continue + cleanup() { + rm "${TMP_INTERMED}" + rm "${TMP_DEFINED}" + rm "${TMP_COMBINED}" } + + CFGFILE="$1" - [ -L "${TNAME}" ] && { - [ "${VERBOSE}" != "no" ] && echo "Found link." - NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'` - echo ${NEWNAME} | grep -v "^/" >/dev/null && { - TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}" - [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-." - } || { - TNAME="${NEWNAME}" - [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-." - } + [ `basename "${CFGFILE}"` = "${COREDEF}" ] && return 0 + + TMP_INTERMED="${TMPROOT}/tmp.$$" + TMP_DEFINED="${TMPROOT}/tmpdefined.$$" + TMP_COMBINED="${TMPROOT}/tmpcombined.$$" + + + cat /etc/passwd | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}" + cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 2 > "${TMP_INTERMED}" + cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}" + + NR_DEFINED_USERS="`cat "${TMP_DEFINED}" | wc -l`" + NR_COMBINED_USERS="`cat "${TMP_COMBINED}" | wc -l`" + + [ "${NR_DEFINED_USERS}" -ne "${NR_COMBINED_USERS}" ] && { + echo "Undefined users:" + diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>" + cleanup + return 1 + } + + + cat /etc/group | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}" + cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 3 > "${TMP_INTERMED}" + cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}" + + NR_DEFINED_GROUPS="`cat "${TMP_DEFINED}" | wc -l`" + NR_COMBINED_GROUPS="`cat "${TMP_COMBINED}" | wc -l`" + + [ "${NR_DEFINED_GROUPS}" -ne "${NR_COMBINED_GROUPS}" ] && { + echo "Undefined groups:" + diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>" + cleanup + return 1 } - [ -e "${TNAME}" ] && { - [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping." - continue + # Add checks for required directories here + + cleanup + return 0 + } + +apply_cfgfile() { + + CFGFILE="$1" + + check_requirements "${CFGFILE}" || { + echo "Skipping ${CFGFILE}" + return 1 } - case "${TTYPE}" in - "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-." - touch "${TNAME}" - ;; - "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-." - mkdir -p "${TNAME}" - # Add check to see if there's an entry in fstab to mount. - ;; - *) [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-." - continue - ;; - esac - - chown ${TUSER} ${TNAME} || echo "Failed to set owner -${TUSER}- for -${TNAME}-." >&2 - chgrp ${TGROUP} ${TNAME} || echo "Failed to set group -${TGROUP}- for -${TNAME}-." >&2 - chmod ${TMODE} ${TNAME} || echo "Failed to set mode -${TMODE}- for -${TNAME}-." >&2 + cat ${CFGFILE} | grep -v "^#" | \ + while read LINE; do + TTYPE=`echo ${LINE} | cut -d " " -f 1` + TUSER=`echo ${LINE} | cut -d " " -f 2` + TGROUP=`echo ${LINE} | cut -d " " -f 3` + TMODE=`echo ${LINE} | cut -d " " -f 4` + TNAME=`echo ${LINE} | cut -d " " -f 5` + + [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-." + + [ "${TTYPE}" = "l" ] && { + [ -e "${TNAME}" ] && { + echo "Cannot create link over existing -${TNAME}-." >&2 + } || { + TSOURCE=`echo ${LINE} | cut -d " " -f 6` + [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-." + ln -s "${TSOURCE}" "${TNAME}" + } + continue + } + + [ -L "${TNAME}" ] && { + [ "${VERBOSE}" != "no" ] && echo "Found link." + NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'` + echo ${NEWNAME} | grep -v "^/" >/dev/null && { + TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}" + [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-." + } || { + TNAME="${NEWNAME}" + [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-." + } + } + + [ -e "${TNAME}" ] && { + [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping." + continue + } + + case "${TTYPE}" in + "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-." + touch "${TNAME}" + ;; + "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-." + mkdir -p "${TNAME}" + # Add check to see if there's an entry in fstab to mount. + ;; + *) [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-." + continue + ;; + esac + + chown ${TUSER} ${TNAME} || echo "Failed to set owner -${TUSER}- for -${TNAME}-." >&2 + chgrp ${TGROUP} ${TNAME} || echo "Failed to set group -${TGROUP}- for -${TNAME}-." >&2 + chmod ${TMODE} ${TNAME} || echo "Failed to set mode -${TMODE}- for -${TNAME}-." >&2 + + done + + return 0 + + } + +for file in `ls -1 "${CFGDIR}" | sort`; do + apply_cfgfile "${CFGDIR}/${file}" done diff --git a/packages/initscripts/initscripts-openslug_1.0.bb b/packages/initscripts/initscripts-openslug_1.0.bb index b5252bfdeb..4e82022876 100644 --- a/packages/initscripts/initscripts-openslug_1.0.bb +++ b/packages/initscripts/initscripts-openslug_1.0.bb @@ -11,7 +11,7 @@ RCONFLICTS = "initscripts" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.2" +PR := "${PR}.3" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" @@ -96,7 +96,7 @@ do_install_append() { # checkfs.sh is currently disabled from S 30 (and won't work on OpenSlug) # ramdisk is not used on OpenSlug, would run at S 30 update-rc.d -r ${D} mountall.sh start 35 S . - # base-files populate-var.sh runs at S37 + # base-files populate-volatile.sh runs at S37 update-rc.d -r ${D} devpts.sh start 38 S . # openslug file syslog starts here (39) diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 76755e1744..5e7d6fe44c 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r51" +PR = "r52" SRC_URI = "file://halt \ file://ramdisk \ @@ -66,7 +66,8 @@ do_install () { ${D}${sysconfdir}/rc4.d \ ${D}${sysconfdir}/rc5.d \ ${D}${sysconfdir}/rc6.d \ - ${D}${sysconfdir}/default + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/default/volatiles install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/checkroot.sh ${D}${sysconfdir}/init.d @@ -86,7 +87,7 @@ do_install () { install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ "${TARGET_ARCH}" = "arm" ]; then install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d fi -- cgit v1.2.3 From 11960173ec932aa50eca16f19f6afb5b16e122c5 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 31 Jul 2005 13:53:33 +0000 Subject: Fixed compilation for 2.4 and 2.6 (.o vs .ko). Fixes OE bug #190 --- packages/at76c503a/at76c503a-modules_cvs.bb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb index 8f11aeeff3..5e56c4787a 100644 --- a/packages/at76c503a/at76c503a-modules_cvs.bb +++ b/packages/at76c503a/at76c503a-modules_cvs.bb @@ -3,13 +3,15 @@ LICENSE = "GPL" SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \ file://makefile.cc.patch;patch=1" S = "${WORKDIR}/at76c503a" -PR = "r1" +PR = "r2" PV = "0.0cvs${CVSDATE}" inherit module -MODULES = "at76c503.ko at76_usbdfu.ko at76c503-i3861.ko at76c503-rfmd.ko at76c503-rfmd-acc.ko \ - at76c505-rfmd.ko at76c503-i3863.ko at76c505-rfmd2958.ko" +MODULES = "at76c503 at76_usbdfu at76c503-i3861 at76c503-rfmd at76c503-rfmd-acc \ + at76c505-rfmd at76c503-i3863 at76c505-rfmd2958" +MODULES_EXTENSION = "o" +MODULES_EXTENSION_kernel26 = "ko" pkg_postinst() { #!/bin/sh @@ -26,8 +28,9 @@ update-modules || true do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/ - for i in ${MODULES}; do install -m 0644 $i ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/$i; done - + for i in ${MODULES}; do + install -m 0644 $i.${MODULES_EXTENSION} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/ + done if [ "${MACHINE}" = "h3900" ]; then install -d ${D}${sysconfdir}/modutils echo "at76c503-rfmd" > ${D}${sysconfdir}/modutils/at76c503-rfmd -- cgit v1.2.3 From 0246ee976adbdfbcd7509ae9f0f4dd92d0128a7f Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 31 Jul 2005 13:54:46 +0000 Subject: Added portmap-utils RDEPENDS so nfs works out of the box. Fixes slugbug #229 --- packages/portmap/portmap_5-9.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/portmap/portmap_5-9.bb b/packages/portmap/portmap_5-9.bb index 3092b70539..9df7c0c021 100644 --- a/packages/portmap/portmap_5-9.bb +++ b/packages/portmap/portmap_5-9.bb @@ -1,7 +1,8 @@ DESCRIPTION = "RPC program number mapper." SECTION = "console/network" LICENSE = "GPL" -PR = "r3" +RDEPENDS = "portmap-utils" +PR = "r4" SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ -- cgit v1.2.3