diff options
Diffstat (limited to 'packages')
100 files changed, 1706 insertions, 668 deletions
diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc index 8569845394..58f712aca9 100644 --- a/packages/abiword/abiword.inc +++ b/packages/abiword/abiword.inc @@ -3,8 +3,9 @@ HOMEPAGE = "http://www.abiword.org"" SECTION = "x11/office" LICENSE = "GPLv2" DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2" -RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ - glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" +RDEPENDS = "enchant " +RDEPENDS_linux += "glibc-gconv-ibm850 glibc-gconv-cp1252 \ + glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" PR = "r2" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" diff --git a/packages/classpath/classpath-gtk_0.90.bb b/packages/classpath/classpath-gtk_0.90.bb deleted file mode 100644 index b83d23d9c0..0000000000 --- a/packages/classpath/classpath-gtk_0.90.bb +++ /dev/null @@ -1,16 +0,0 @@ -require classpath.inc - -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" -RDEPENDS_${PBN}-gtk = "${PBN}-common (>= ${PV})" -RCONFLICTS_${PBN}-gtk = "${PBN}-minimal" - -EXTRA_OECONF = "--with-jikes" - -PACKAGES = "${PBN}-dev ${PBN}-doc ${PBN}-common ${PBN}-examples ${PBN}-tools ${PN}" - -FILES_${PBN}-doc = "${datadir}/info" -FILES_${PBN}-dev = "${includedir}" -FILES_${PN} = "${libdir}" -FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip" -FILES_${PBN}-examples = "${datadir}/${PBN}/examples" -FILES_${PBN}-tools = "${datadir}/${PBN}/tools" diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb new file mode 100644 index 0000000000..137ee8ffb2 --- /dev/null +++ b/packages/classpath/classpath-gtk_0.93.bb @@ -0,0 +1,18 @@ +require classpath.inc + +DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-native" +RDEPENDS_${PN} = "classpath-common (>= ${PV})" +RCONFLICTS_${PN} = "classpath-minimal" + +SRC_URI += "file://gconf_version.patch;patch=1" + +EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi" + +PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" + +FILES_classpath-doc = "${datadir}/info" +FILES_classpath-dev = "${includedir}" +FILES_${PN} = "${libdir} ${bindir}" +FILES_classpath-common = "${datadir}/classpath/glibj.zip" +FILES_classpath-examples = "${datadir}/classpath/examples" +FILES_classpath-tools = "${datadir}/classpath/tools.zip" diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb new file mode 100644 index 0000000000..53f494ab15 --- /dev/null +++ b/packages/classpath/classpath-gtk_cvs.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "GNU Classpath standard Java libraries" +HOMEPAGE = "http://www.gnu.org/software/classpath/" +LICENSE = "Classpath" +PRIORITY = "optional" +SECTION = "libs" +PR = "r1" + +SRCDATE_${PN} ?= "20070501" +PV = "0.93+cvs${SRCDATE}" + +DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native" +RDEPENDS_${PN} = "classpath-common (>= ${PV})" +RCONFLICTS_${PN} = "classpath-minimal" + +SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpath \ + file://disable-automake-checks-v2.patch;patch=1" + +S = "${WORKDIR}/classpath" + +inherit autotools + +EXTRA_OECONF = "--with-ecj=${STAGING_BINDIR_NATIVE}/ecj --with-ecj-jar=${STAGING_BINDIR_NATIVE}/ecj.jar --disable-plugin --disable-dssi --disable-alsa" + +PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" + +FILES_classpath-doc = "${datadir}/info ${datadir}/man" +FILES_classpath-dev = "${includedir}" +FILES_${PN} = "${libdir} ${bindir}" +FILES_classpath-common = "${datadir}/classpath/glibj.zip" +FILES_classpath-examples = "${datadir}/classpath/examples" +FILES_classpath-tools = "${datadir}/classpath/tools.zip" + +do_stage() { + install -d ${STAGING_INCDIR}/classpath + install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ + install -d ${STAGING_DATADIR}/classpath + install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/ +} + +do_install() { + autotools_do_install + mv ${D}${libdir}/security ${D}${libdir}/${PN} +} + +PROVIDES = "classpath" +RPROVIDES = "classpath" diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb new file mode 100644 index 0000000000..8a08a6c1ce --- /dev/null +++ b/packages/classpath/classpath-minimal-native_0.93.bb @@ -0,0 +1,20 @@ +require classpath.inc + +DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native" + +SRC_URI += "file://gconf_version.patch;patch=1" + +inherit native + +EXTRA_OECONF = "--with-jikes --disable-gconf-peer --disable-gtk-peer --disable-plugin --disable-dssi --disable-examples" + +do_stage() { + install -d ${STAGING_INCDIR}/classpath + install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ + install -d ${STAGING_DATADIR}/classpath + install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/ +} + +do_install() { + : +} diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index 303c286d4e..e66f5d7456 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -1,17 +1,15 @@ DESCRIPTION = "GNU Classpath standard Java libraries" HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" SECTION = "libs" +PRIORITY = "optional" +LICENSE = "Classpath" +PROVIDES = "classpath" +RPROVIDES = "classpath" -PBN = "classpath" - -SRC_URI = "${GNU_MIRROR}/classpath/${PBN}-${PV}.tar.gz \ +SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \ file://disable-automake-checks.patch;patch=1 \ file://fix-endian-arm-floats.patch;patch=1" -S = "${WORKDIR}/${PBN}-${PV}" - inherit autotools do_stage() { @@ -21,8 +19,11 @@ do_stage() { do_install() { autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PBN} + mv ${D}${libdir}/security ${D}${libdir}/${PN} } -PROVIDES = "classpath" -RPROVIDES = "classpath" +PACKAGES =+ "classpath-common classpath-examples classpath-tools" +FILES_classpath-common += "${datadir}/classpath/glibj.zip" +FILES_classpath-examples += "${datadir}/classpath/examples" +FILES_classpath-tools += "${datadir}/classpath/tools.zip ${datadir}/classpath/tools" +FILES_classpath-dev += "${libdir}/*.so" diff --git a/packages/classpath/classpath_0.14.bb b/packages/classpath/classpath_0.14.bb index 439d973cc8..e4d73bbd3a 100644 --- a/packages/classpath/classpath_0.14.bb +++ b/packages/classpath/classpath_0.14.bb @@ -1,32 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" -PR = "r1" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" +PR = "r2" 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_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/classpath_0.15.bb b/packages/classpath/classpath_0.15.bb index 439d973cc8..e4d73bbd3a 100644 --- a/packages/classpath/classpath_0.15.bb +++ b/packages/classpath/classpath_0.15.bb @@ -1,32 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" -PR = "r1" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" +PR = "r2" 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_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/classpath_0.17.bb b/packages/classpath/classpath_0.17.bb index a28591ac0d..e4d73bbd3a 100644 --- a/packages/classpath/classpath_0.17.bb +++ b/packages/classpath/classpath_0.17.bb @@ -1,32 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" -PR = "r1" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" +PR = "r2" 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_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/classpath_0.18.bb b/packages/classpath/classpath_0.18.bb index a9a2b2cd2d..9b9e8c3451 100644 --- a/packages/classpath/classpath_0.18.bb +++ b/packages/classpath/classpath_0.18.bb @@ -1,31 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (>= ${PV})" +PR = "r1" 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_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/classpath_0.19.bb b/packages/classpath/classpath_0.19.bb index a9a2b2cd2d..9b9e8c3451 100644 --- a/packages/classpath/classpath_0.19.bb +++ b/packages/classpath/classpath_0.19.bb @@ -1,31 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (>= ${PV})" +PR = "r1" 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_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/classpath_0.20.bb b/packages/classpath/classpath_0.20.bb index a9a2b2cd2d..9b9e8c3451 100644 --- a/packages/classpath/classpath_0.20.bb +++ b/packages/classpath/classpath_0.20.bb @@ -1,31 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (>= ${PV})" +PR = "r1" 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_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/files/disable-automake-checks-v2.patch b/packages/classpath/files/disable-automake-checks-v2.patch new file mode 100644 index 0000000000..0c1df1acae --- /dev/null +++ b/packages/classpath/files/disable-automake-checks-v2.patch @@ -0,0 +1,11 @@ +--- sablevm-classpath-1.1.7/configure.ac.orig 2004-11-26 00:23:01.000000000 +0100 ++++ sablevm-classpath-1.1.7/configure.ac 2004-11-26 00:23:46.000000000 +0100 +@@ -34,7 +34,7 @@ + AC_SUBST(CLASSPATH_MODULE) + + AC_PREREQ(2.59) +-AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) ++AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local) + diff --git a/packages/classpath/files/gconf_version.patch b/packages/classpath/files/gconf_version.patch new file mode 100644 index 0000000000..b1be1209a2 --- /dev/null +++ b/packages/classpath/files/gconf_version.patch @@ -0,0 +1,11 @@ +--- classpath-0.93/configure.ac~ 2007-03-29 15:52:30.000000000 -0500 ++++ classpath-0.93/configure.ac 2007-03-29 15:52:30.000000000 -0500 +@@ -496,7 +496,7 @@ + + dnl gconf-peer + if test "x${COMPILE_GCONF_PEER}" = xyes; then +- PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.11.2) ++ PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.0) + AC_SUBST(GCONF_CFLAGS) + AC_SUBST(GCONF_LIBS) + dnl we also need gdk for locking diff --git a/packages/elfutils/elfutils-0.108/.mtn2git_empty b/packages/elfutils/elfutils-0.127/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/elfutils/elfutils-0.108/.mtn2git_empty +++ b/packages/elfutils/elfutils-0.127/.mtn2git_empty diff --git a/packages/elfutils/elfutils-0.108/warnings.patch b/packages/elfutils/elfutils-0.127/warnings.patch index 9de027ee26..c2e7fc2f3d 100644 --- a/packages/elfutils/elfutils-0.108/warnings.patch +++ b/packages/elfutils/elfutils-0.127/warnings.patch @@ -2,7 +2,7 @@ Index: elfutils-0.108/configure.ac =================================================================== --- elfutils-0.108.orig/configure.ac 2006-04-10 19:18:34.000000000 +0100 +++ elfutils-0.108/configure.ac 2006-04-10 19:19:33.000000000 +0100 -@@ -49,6 +49,10 @@ +@@ -55,6 +55,10 @@ dnl Add all the languages for which translations are available. ALL_LINGUAS= @@ -17,7 +17,7 @@ Index: elfutils-0.108/lib/Makefile.am =================================================================== --- elfutils-0.108.orig/lib/Makefile.am 2006-04-10 19:18:34.000000000 +0100 +++ elfutils-0.108/lib/Makefile.am 2006-04-10 19:19:33.000000000 +0100 -@@ -21,7 +21,7 @@ +@@ -30,7 +30,7 @@ else AM_CFLAGS = endif @@ -28,15 +28,16 @@ Index: elfutils-0.108/lib/Makefile.am noinst_LIBRARIES = libeu.a Index: elfutils-0.108/libasm/Makefile.am =================================================================== ---- elfutils-0.108.orig/libasm/Makefile.am 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.108/libasm/Makefile.am 2006-04-10 19:19:33.000000000 +0100 -@@ -18,7 +18,7 @@ +--- elfutils-0.127.orig/libasm/Makefile.am 2006-04-10 19:18:34.000000000 +0100 ++++ elfutils-0.127/libasm/Makefile.am 2006-04-10 19:19:33.000000000 +0100 +@@ -30,7 +30,7 @@ else AM_CFLAGS = endif --AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -+AM_CFLAGS += -Wshadow -Wunused -Wformat=2 - INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \ +-AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 ++AM_CFLAGS += -std=gnu99 -Wshadow -Wunused -Wformat=2 + INCLUDES = -I. -I$(srcdir) -I.. \ + -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ -I$(top_srcdir)/lib GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) Index: elfutils-0.108/libcpu/Makefile.am @@ -91,28 +92,6 @@ Index: elfutils-0.108/libelf/Makefile.am $($(*F)_CFLAGS) INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) -Index: elfutils-0.108/src/Makefile.am -=================================================================== ---- elfutils-0.108.orig/src/Makefile.am 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.108/src/Makefile.am 2006-04-10 19:20:19.000000000 +0100 -@@ -15,14 +15,12 @@ - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \ - -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" - if MUDFLAP --AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fmudflap \ -+AM_CFLAGS = -Wshadow -Wunused -std=gnu99 -fmudflap \ - $(native_ld_cflags) $(if $($(*F)_no_Wunused),,-Wunused) \ - $(if $($(*F)_no_Wformat),,-Wformat=2) - else --AM_CFLAGS = -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \ -- $(if $($(*F)_no_Werror),,-Werror) \ -- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ -- $(if $($(*F)_no_Wformat),,-Wformat=2) -+AM_CFLAGS = -Wshadow -std=gnu99 $(native_ld_cflags) \ -+ $(if $($(*F)_no_Werror),,-Werror) - endif - if MUDFLAP - libmudflap = -lmudflap Index: elfutils-0.108/tests/Makefile.am =================================================================== --- elfutils-0.108.orig/tests/Makefile.am 2006-04-10 19:18:34.000000000 +0100 @@ -121,12 +100,13 @@ Index: elfutils-0.108/tests/Makefile.am ## DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE if MUDFLAP --AM_CFLAGS = -Wall -Werror -std=gnu99 -fmudflap\ +-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ +AM_CFLAGS = -std=gnu99 -fmudflap\ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) + BUILD_RPATH = \$$ORIGIN/../backends else --AM_CFLAGS = -Wall -Werror -std=gnu99 \ +-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ +AM_CFLAGS = -std=gnu99 \ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) - AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf + BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf endif diff --git a/packages/elfutils/elfutils_0.108.bb b/packages/elfutils/elfutils_0.108.bb deleted file mode 100644 index 83acc7dccb..0000000000 --- a/packages/elfutils/elfutils_0.108.bb +++ /dev/null @@ -1,36 +0,0 @@ -SECTION = "base" -LICENSE = "OSL" -DESCRIPTION = "A collection of utilities and DSOs to handle compiled objects." -DEPENDS = "libtool" - -SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \ - file://warnings.patch;patch=1" - -inherit autotools - -SOV = "${PV}" -do_stage () { - install -m 0644 libelf/libelf.a ${STAGING_LIBDIR}/libelf.a - install -m 0755 libelf/libelf.so.1 ${STAGING_LIBDIR}/libelf-${SOV}.so - ln -sf libelf-${SOV}.so ${STAGING_LIBDIR}/libelf.so.1 - ln -sf libelf.so.1 ${STAGING_LIBDIR}/libelf.so - install -m 0644 libasm/libasm.a ${STAGING_LIBDIR}/libasm.a - install -m 0755 libasm/libasm.so.1 ${STAGING_LIBDIR}/libasm-${SOV}.so - ln -sf libasm-${SOV}.so ${STAGING_LIBDIR}/libasm.so.1 - ln -sf libasm.so.1 ${STAGING_LIBDIR}/libasm.so - install -m 0644 libdw/libdw.a ${STAGING_LIBDIR}/libdw.a - install -m 0755 libdw/libdw.so.1 ${STAGING_LIBDIR}/libdw-${SOV}.so - ln -sf libdw-${SOV}.so ${STAGING_LIBDIR}/libdw.so.1 - ln -sf libdw.so.1 ${STAGING_LIBDIR}/libdw.so - install -m 0644 libebl/libebl.a ${STAGING_LIBDIR}/libebl.a - install -d ${STAGING_LIBDIR}/elfutils/ - install -m 0755 libebl/libebl_*.so ${STAGING_LIBDIR}/elfutils/ - - install -m 0644 ${S}/libelf/libelf.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/libelf/gelf.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/libelf/nlist.h ${STAGING_INCDIR}/ - install -d ${STAGING_INCDIR}/elfutils - install -m 0644 ${S}/libebl/libebl.h ${STAGING_INCDIR}/elfutils/ - install -m 0644 ${S}/libdw/libdw.h ${STAGING_INCDIR}/elfutils/ - install -m 0644 ${S}/libasm/libasm.h ${STAGING_INCDIR}/elfutils/ -} diff --git a/packages/elfutils/elfutils_0.127.bb b/packages/elfutils/elfutils_0.127.bb new file mode 100644 index 0000000000..22f3b0ae46 --- /dev/null +++ b/packages/elfutils/elfutils_0.127.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A collection of utilities and DSOs to handle compiled objects." +SECTION = "base" +LICENSE = "OSL" +DEPENDS = "libtool" + +SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \ + file://warnings.patch;patch=1" + +inherit autotools + +do_stage () { + autotools_stage_all +} + + diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index adb8a45283..82ab193073 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -23,7 +23,7 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -PROVIDES_unslung = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" +PROVIDES_unslung = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc libc6-unslung" libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" diff --git a/packages/glibmm/glibmm_2.8.4.bb b/packages/glibmm/glibmm_2.8.4.bb index a1235ae563..1819114cb1 100644 --- a/packages/glibmm/glibmm_2.8.4.bb +++ b/packages/glibmm/glibmm_2.8.4.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "gtk+ libsigc++-2.0" -PR = "r1" +DEPENDS = "glib-2.0 libsigc++-2.0" +PR = "r2" SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-${PV}.tar.bz2" diff --git a/packages/gpe-timesheet/gpe-timesheet.inc b/packages/gpe-timesheet/gpe-timesheet.inc new file mode 100644 index 0000000000..11c1327752 --- /dev/null +++ b/packages/gpe-timesheet/gpe-timesheet.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "GPE time tracker" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "libgpewidget gtk+ sqlite libtododb" +RDEPENDS = "gpe-icons" + +inherit autotools gpe + +GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.30.bb b/packages/gpe-timesheet/gpe-timesheet_0.30.bb index 1e995c2d81..c642bfacb5 100644 --- a/packages/gpe-timesheet/gpe-timesheet_0.30.bb +++ b/packages/gpe-timesheet/gpe-timesheet_0.30.bb @@ -1,9 +1,3 @@ -LICENSE = "GPL" -inherit autotools gpe +require gpe-timesheet.inc -DESCRIPTION = "GPE time tracker" -GPE_TARBALL_SUFFIX = "bz2" -DEPENDS = "libgpewidget gtk+ sqlite libtododb" -SECTION = "gpe" -RDEPENDS = "gpe-icons" PR = "r1" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.31.bb b/packages/gpe-timesheet/gpe-timesheet_0.31.bb index 1e995c2d81..c642bfacb5 100644 --- a/packages/gpe-timesheet/gpe-timesheet_0.31.bb +++ b/packages/gpe-timesheet/gpe-timesheet_0.31.bb @@ -1,9 +1,3 @@ -LICENSE = "GPL" -inherit autotools gpe +require gpe-timesheet.inc -DESCRIPTION = "GPE time tracker" -GPE_TARBALL_SUFFIX = "bz2" -DEPENDS = "libgpewidget gtk+ sqlite libtododb" -SECTION = "gpe" -RDEPENDS = "gpe-icons" PR = "r1" diff --git a/packages/gpe-timesheet/gpe-timesheet_svn.bb b/packages/gpe-timesheet/gpe-timesheet_svn.bb index 0eae00b1ca..28eb65d31b 100644 --- a/packages/gpe-timesheet/gpe-timesheet_svn.bb +++ b/packages/gpe-timesheet/gpe-timesheet_svn.bb @@ -1,13 +1,8 @@ -DESCRIPTION = "GPE time tracker" -SECTION = "gpe" -LICENSE = "GPL" -DEPENDS = "libgpewidget gtk+ sqlite libtododb" -RDEPENDS = "gpe-icons" +require gpe-timesheet.inc + PR = "r1" PV = "0.31+svn-${SRCDATE}" -inherit autotools - SRC_URI = "${GPE_SVN}" S = "${WORKDIR}/${PN}" diff --git a/packages/gpe-what/gpe-what.inc b/packages/gpe-what/gpe-what.inc new file mode 100644 index 0000000000..fd4307631e --- /dev/null +++ b/packages/gpe-what/gpe-what.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "GPE modal help" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "virtual/libx11 gtk+" + +inherit autotools gpe + +GPE_TARBALL_SUFFIX= "bz2" diff --git a/packages/gpe-what/gpe-what_0.30.bb b/packages/gpe-what/gpe-what_0.30.bb index 9c711a624d..165ea4cc3b 100644 --- a/packages/gpe-what/gpe-what_0.30.bb +++ b/packages/gpe-what/gpe-what_0.30.bb @@ -1,9 +1,4 @@ -LICENSE = "GPL" -SECTION = "gpe" -inherit gpe - -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11" +require gpe-what.inc do_compile_prepend() { rm *.d diff --git a/packages/gpe-what/gpe-what_0.31.bb b/packages/gpe-what/gpe-what_0.31.bb index 362e573538..50a614bdd2 100644 --- a/packages/gpe-what/gpe-what_0.31.bb +++ b/packages/gpe-what/gpe-what_0.31.bb @@ -1,6 +1,3 @@ -LICENSE = "GPL" -SECTION = "gpe" -inherit gpe +require gpe-what.inc -DESCRIPTION = "GPE modal help" DEPENDS = "virtual/libx11 libxpm libmatchbox" diff --git a/packages/gpe-what/gpe-what_0.33.bb b/packages/gpe-what/gpe-what_0.33.bb index ed7c7577ec..71ae7dac95 100644 --- a/packages/gpe-what/gpe-what_0.33.bb +++ b/packages/gpe-what/gpe-what_0.33.bb @@ -1,8 +1,5 @@ -LICENSE = "GPL" -SECTION = "gpe" -inherit gpe +require gpe-what.inc SRC_URI += "file://makefile-fix.patch;patch=1" -DESCRIPTION = "GPE modal help" DEPENDS = "virtual/libx11 libxpm libmatchbox" diff --git a/packages/gpe-what/gpe-what_0.41.bb b/packages/gpe-what/gpe-what_0.41.bb index 2cc0dc9c2f..853abec8aa 100644 --- a/packages/gpe-what/gpe-what_0.41.bb +++ b/packages/gpe-what/gpe-what_0.41.bb @@ -1,8 +1 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11 gtk+" - - -GPE_TARBALL_SUFFIX= "bz2" -inherit autotools gpe - +require gpe-what.inc diff --git a/packages/gpe-what/gpe-what_0.42.bb b/packages/gpe-what/gpe-what_0.42.bb index 2cc0dc9c2f..853abec8aa 100644 --- a/packages/gpe-what/gpe-what_0.42.bb +++ b/packages/gpe-what/gpe-what_0.42.bb @@ -1,8 +1 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11 gtk+" - - -GPE_TARBALL_SUFFIX= "bz2" -inherit autotools gpe - +require gpe-what.inc diff --git a/packages/gpe-what/gpe-what_0.43.bb b/packages/gpe-what/gpe-what_0.43.bb index b82da4ff7f..624f2e365e 100644 --- a/packages/gpe-what/gpe-what_0.43.bb +++ b/packages/gpe-what/gpe-what_0.43.bb @@ -1,9 +1,5 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11 gtk+" -PR = "r1" +require gpe-what.inc -GPE_TARBALL_SUFFIX= "bz2" -inherit autotools gpe +PR = "r1" SRC_URI += " file://set-wm-hint.patch;patch=1;pnum=0" diff --git a/packages/gpe-what/gpe-what_svn.bb b/packages/gpe-what/gpe-what_svn.bb index 7ecaf20a2f..c448751096 100644 --- a/packages/gpe-what/gpe-what_svn.bb +++ b/packages/gpe-what/gpe-what_svn.bb @@ -1,9 +1,6 @@ -DESCRIPTION = "GPE modal help" -LICENSE = "GPL" -DEPENDS = "virtual/libx11 gtk+" -PV = "0.41+svn${SRCDATE}" +require gpe-what.inc -inherit autotools +PV = "0.41+svn${SRCDATE}" SRC_URI = "${GPE_SVN}" diff --git a/packages/gpephone/connect_0.1.bb b/packages/gpephone/connect_0.1.bb index c5ce0a0d54..a3171eef97 100644 --- a/packages/gpephone/connect_0.1.bb +++ b/packages/gpephone/connect_0.1.bb @@ -17,6 +17,6 @@ do_compile() { do_install() { install -d ${D}/${prefix}/bin - install -m755 connect ${D}/${prefix}/bin - install -m755 disconnect ${D}/${prefix}/bin + install -m 755 connect ${D}/${prefix}/bin + install -m 755 disconnect ${D}/${prefix}/bin } diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb index 24d4a27e80..00031ac546 100644 --- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb +++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb @@ -34,7 +34,7 @@ do_install_append() { mv ${D}/usr/bin/gpe-logout ${D}/usr/bin/gpe-logout.matchbox install -d ${D}${sysconfdir}/X11 - install -m755 ${WORKDIR}/phonesession ${D}${sysconfdir}/X11/phonesession + install -m 755 ${WORKDIR}/phonesession ${D}${sysconfdir}/X11/phonesession } do_install_append_x86() { diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc index 6f9035055b..7f610294d1 100644 --- a/packages/gtk+/gtk-2.10.inc +++ b/packages/gtk+/gtk-2.10.inc @@ -27,9 +27,11 @@ FILES_${PN}-dbg += " \ ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*" -RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1 ttf-dejavu-sans" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN} = " ttf-dejavu-sans" +RRECOMMENDS_${PN}_angstrom += " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus += " gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_linux += " glibc-gconv-iso8859-1" + EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" diff --git a/packages/gtk-engines/gtk-engines_2.2.0.bb b/packages/gtk-engines/gtk-engines_2.2.0.bb deleted file mode 100644 index 5572568f61..0000000000 --- a/packages/gtk-engines/gtk-engines_2.2.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/base" -DESCRIPTION = "GTK theme engines" -DEPENDS = "gtk+" - -PACKAGES += " gtk-engine-pixmap gtk-engine-redmond95 gtk-engine-metal gtk-theme-metal gtk-theme-redmond95" -FILES_gtk-engine-pixmap = "${libdir}/gtk-2.0/*/engines/libpixmap.so" -FILES_gtk-engine-redmond95 = "${libdir}/gtk-2.0/*/engines/libredmond95.so" -FILES_gtk-engine-metal = "${libdir}/gtk-2.0/*/engines/libmetal.so" -FILES_gtk-theme-redmond95 = "${datadir}/themes/Redmond95" -FILES_gtk-theme-metal = "${datadir}/themes/Metal" -DEPENDS_gtk-theme-redmond95 = "gtk-engine-redmond95" -DEPENDS_gtk-theme-metal = "gtk-engine-metal" - -SRC_URI = "${GNOME_MIRROR}/${PN}/2.2/${PN}-${PV}.tar.bz2" - -inherit autotools pkgconfig diff --git a/packages/gtk-engines/gtk-engines_2.6.1.bb b/packages/gtk-engines/gtk-engines_2.6.1.bb deleted file mode 100644 index 6e192d78fd..0000000000 --- a/packages/gtk-engines/gtk-engines_2.6.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/base" -DESCRIPTION = "GTK theme engines" -DEPENDS = "gtk+" - -RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95" -RDEPENDS_gtk-theme-metal = "gtk-engine-metal" -RDEPENDS_gtk-theme-mist = "gtk-engine-mist" -RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine" -RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue" -RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice" -RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial" - -SRC_URI = "${GNOME_MIRROR}/${PN}/2.6/${PN}-${PV}.tar.bz2" - -inherit autotools pkgconfig - -PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" - -python populate_packages_prepend() { - import os.path - - engines_root = os.path.join(bb.data.getVar('libdir', d, 1), "gtk-2.0/2.4.0/engines") - themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes") - - do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') - do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') -} - diff --git a/packages/gtk-engines/gtk-engines_2.6.3.bb b/packages/gtk-engines/gtk-engines_2.6.3.bb deleted file mode 100644 index 6e192d78fd..0000000000 --- a/packages/gtk-engines/gtk-engines_2.6.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/base" -DESCRIPTION = "GTK theme engines" -DEPENDS = "gtk+" - -RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95" -RDEPENDS_gtk-theme-metal = "gtk-engine-metal" -RDEPENDS_gtk-theme-mist = "gtk-engine-mist" -RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine" -RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue" -RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice" -RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial" - -SRC_URI = "${GNOME_MIRROR}/${PN}/2.6/${PN}-${PV}.tar.bz2" - -inherit autotools pkgconfig - -PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" - -python populate_packages_prepend() { - import os.path - - engines_root = os.path.join(bb.data.getVar('libdir', d, 1), "gtk-2.0/2.4.0/engines") - themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes") - - do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') - do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') -} - diff --git a/packages/gtk-engines/gtk-engines_2.6.5.bb b/packages/gtk-engines/gtk-engines_2.6.5.bb index 6e192d78fd..e795791cfc 100644 --- a/packages/gtk-engines/gtk-engines_2.6.5.bb +++ b/packages/gtk-engines/gtk-engines_2.6.5.bb @@ -1,7 +1,9 @@ -LICENSE = "GPL" -SECTION = "x11/base" DESCRIPTION = "GTK theme engines" +SECTION = "x11/base" +PRIORITY = "optional" +LICENSE = "GPL" DEPENDS = "gtk+" +PR = "r1" RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95" RDEPENDS_gtk-theme-metal = "gtk-engine-metal" @@ -20,10 +22,11 @@ PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" python populate_packages_prepend() { import os.path - engines_root = os.path.join(bb.data.getVar('libdir', d, 1), "gtk-2.0/2.4.0/engines") + engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines'] + + engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver)) themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes") do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') } - diff --git a/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb b/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb index 95a8d87d9c..28888c45ba 100644 --- a/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb +++ b/packages/gtk-engines/gtk-smooth-engine_0.5.8.bb @@ -1,11 +1,22 @@ -PR = "r0" -LICENSE = "LGPL" -SECTION = "x11/base" DESCRIPTION = "GTK theme engine Smooth" +SECTION = "x11/base" +PRIORITY = "optional" +LICENSE = "LGPL" DEPENDS = "gtk+" - -FILES_${PN} = "${libdir}/gtk-2.0/2.4.0/engines/libsmooth.so" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/smooth-engine/${PN}-${PV}.tar.gz" inherit autotools pkgconfig + +python populate_packages_prepend() { + import os.path + + engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines'] + + engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver)) + themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes") + + do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') + do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') +} diff --git a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb index 33b0423e25..f44e8b57a6 100644 --- a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb +++ b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb @@ -1,22 +1,15 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" +require gtkhtml.inc + DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" PR = "r0" -inherit gnome - SRC_URI = "http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz" - FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so" FILES_${PN}-dev += "${libdir}/gtkhtml" -S = "${WORKDIR}/libgtkhtml2-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { - mv src/libgtkhtml.pc src/libgtkhtml-2.0.pc || true + mv src/libgtkhtml.pc src/libgtkhtml-2.0.pc || true autotools_stage_all } diff --git a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb index d27f72ae4a..66993cec74 100644 --- a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb +++ b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb @@ -1,18 +1,12 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" +require gtkhtml.inc + DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" PR = "r2" -inherit gnome - SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.0/gtkhtml-${PV}.tar.bz2 \ file://fix-missing-colormap.patch;patch=1" FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so" FILES_${PN}-dev += "${libdir}/gtkhtml" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.0.pc || true diff --git a/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb b/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb index 2b57a0b2c4..1e389dabe0 100644 --- a/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb +++ b/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb @@ -1,15 +1,9 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +require gtkhtml.inc -inherit gnome +DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.1/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.1" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.1.pc || true diff --git a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb index 6194529aa0..fd5fde49ed 100644 --- a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb +++ b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb @@ -1,15 +1,9 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +require gtkhtml.inc -inherit gnome +DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.6" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.6.pc || true diff --git a/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb b/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb index 1db83609c2..cc177de08f 100644 --- a/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb +++ b/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb @@ -1,15 +1,9 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +require gtkhtml.inc -inherit gnome +DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.8/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.8" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.8.pc || true diff --git a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb index 14e6818e7b..44a96d6d64 100644 --- a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb +++ b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb @@ -1,17 +1,11 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" +require gtkhtml.inc + DEPENDS = "gtk+ gail libgnomeprint orbit2-native" PR = "r1" -inherit gnome - SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so" FILES_${PN}-dev += "${libdir}/gtkhtml" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.0.pc || true diff --git a/packages/gtkhtml/gtkhtml.inc b/packages/gtkhtml/gtkhtml.inc new file mode 100644 index 0000000000..f7a346a67a --- /dev/null +++ b/packages/gtkhtml/gtkhtml.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "HTML rendering/editing library" +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "GPL" + +inherit gnome + +S = "${WORKDIR}/gtkhtml-${PV}" + +EXTRA_OECONF = "--disable-gtk-doc" diff --git a/packages/gtkmm/gtkmm.inc b/packages/gtkmm/gtkmm.inc index 843274fdc5..f0c6dc093b 100644 --- a/packages/gtkmm/gtkmm.inc +++ b/packages/gtkmm/gtkmm.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "glibmm" +DEPENDS = "glibmm gtk+" inherit autotools pkgconfig flow-lossage diff --git a/packages/hal/hal.inc b/packages/hal/hal.inc new file mode 100644 index 0000000000..11a6531951 --- /dev/null +++ b/packages/hal/hal.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "Hardware Abstraction Layer" +HOMEPAGE = "http://freedesktop.org/Software/hal" +SECTION = "unknown" +LICENSE = "GPL LGPL AFL" + +SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" + +S = "${WORKDIR}/hal-${PV}" + +inherit autotools pkgconfig diff --git a/packages/hal/hal_0.2.98.bb b/packages/hal/hal_0.2.98.bb index 7c8b8b73eb..468a948b1a 100644 --- a/packages/hal/hal_0.2.98.bb +++ b/packages/hal/hal_0.2.98.bb @@ -1,14 +1,7 @@ -SECTION = "unknown" -DESCRIPTION = "Hardware Abstraction Layer" +require hal.inc + DEPENDS = "dbus expat" RDEPENDS += "hotplug" -HOMEPAGE = "http://freedesktop.org/Software/hal" -LICENSE = "GPL LGPL AFL" - -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.2.bb b/packages/hal/hal_0.5.2.bb index fd29980e56..1ca95e8739 100644 --- a/packages/hal/hal_0.5.2.bb +++ b/packages/hal/hal_0.5.2.bb @@ -1,15 +1,8 @@ -SECTION = "unknown" -DESCRIPTION = "Hardware Abstraction Layer" +require hal.inc + DEPENDS = "dbus expat" RDEPENDS += "hotplug" RRECOMMENDS = "udev-utils" -HOMEPAGE = "http://freedesktop.org/Software/hal" -LICENSE = "GPL LGPL AFL" - -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.4.bb b/packages/hal/hal_0.5.4.bb index 147439d4c3..1246637f67 100644 --- a/packages/hal/hal_0.5.4.bb +++ b/packages/hal/hal_0.5.4.bb @@ -1,18 +1,11 @@ -SECTION = "unknown" -DESCRIPTION = "Hardware Abstraction Layer" +require hal.inc + DEPENDS = "dbus expat libusb" RDEPENDS += "hotplug" RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -HOMEPAGE = "http://freedesktop.org/Software/hal" -LICENSE = "GPL LGPL AFL" PR = "r1" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig - EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ diff --git a/packages/hal/hal_0.5.7.bb b/packages/hal/hal_0.5.7.bb index 5933676260..05a3ea010b 100644 --- a/packages/hal/hal_0.5.7.bb +++ b/packages/hal/hal_0.5.7.bb @@ -1,17 +1,11 @@ -DESCRIPTION = "Hardware Abstraction Layer" -HOMEPAGE = "http://freedesktop.org/Software/hal" -SECTION = "unknown" -LICENSE = "GPL LGPL AFL" +require hal.inc + DEPENDS = "dbus expat libusb" RDEPENDS += "hotplug" #RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ - file://dbus-fix-api.patch;patch=1" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig +SRC_URI += "file://dbus-fix-api.patch;patch=1" EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.8.1.bb b/packages/hal/hal_0.5.8.1.bb index f608c4018c..d0b888192c 100644 --- a/packages/hal/hal_0.5.8.1.bb +++ b/packages/hal/hal_0.5.8.1.bb @@ -1,7 +1,4 @@ -DESCRIPTION = "Hardware Abstraction Layer" -HOMEPAGE = "http://freedesktop.org/Software/hal" -SECTION = "unknown" -LICENSE = "GPL LGPL AFL" +require hal.inc DEPENDS = "dbus-glib udev intltool expat libusb" RDEPENDS += "udev" @@ -10,12 +7,7 @@ RRECOMMENDS = "udev-utils" PR = "r2" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ - file://99_hal" - -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig +SRC_URI += "file://99_hal" EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb index bb9dc82b52..79d53970f3 100644 --- a/packages/hal/hal_0.5.9.bb +++ b/packages/hal/hal_0.5.9.bb @@ -1,7 +1,4 @@ -DESCRIPTION = "Hardware Abstraction Layer" -HOMEPAGE = "http://freedesktop.org/Software/hal" -SECTION = "unknown" -LICENSE = "GPL LGPL AFL" +require hal.inc DEPENDS = "virtual/kernel dbus-glib udev intltool expat libusb" RDEPENDS += "udev hal-info" @@ -10,12 +7,7 @@ RRECOMMENDS = "udev-utils" PR = "r1" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ - file://99_hal" - -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig +SRC_URI += "file://99_hal" EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/intltool/intltool-native_0.30.bb b/packages/intltool/intltool-native_0.30.bb index 7cf3c4e11f..05f7efdda4 100644 --- a/packages/intltool/intltool-native_0.30.bb +++ b/packages/intltool/intltool-native_0.30.bb @@ -1,4 +1,4 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.31.bb b/packages/intltool/intltool-native_0.31.bb index 7cf3c4e11f..05f7efdda4 100644 --- a/packages/intltool/intltool-native_0.31.bb +++ b/packages/intltool/intltool-native_0.31.bb @@ -1,4 +1,4 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.34.bb b/packages/intltool/intltool-native_0.34.bb index 7cf3c4e11f..05f7efdda4 100644 --- a/packages/intltool/intltool-native_0.34.bb +++ b/packages/intltool/intltool-native_0.34.bb @@ -1,4 +1,4 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.35.0.bb b/packages/intltool/intltool-native_0.35.0.bb index fdd2652e11..bac5378113 100644 --- a/packages/intltool/intltool-native_0.35.0.bb +++ b/packages/intltool/intltool-native_0.35.0.bb @@ -1,7 +1,7 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" -export PERL="/usr/bin/env perl" +export PERL = "/usr/bin/env perl" SRC_URI_append = " file://intltool-nowarn.patch;patch=1" diff --git a/packages/intltool/intltool.inc b/packages/intltool/intltool.inc new file mode 100644 index 0000000000..f4de1ff4aa --- /dev/null +++ b/packages/intltool/intltool.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Utility scripts for internationalizing XML" +PRIORITY = "optional" +SECTION = "devel" +LICENSE = "GPL" + +SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" +S = "${WORKDIR}/intltool-${PV}" + +inherit autotools pkgconfig + +do_stage() { + install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/intltool/intltool_0.30.bb b/packages/intltool/intltool_0.30.bb index f1660e7262..e48262574b 100644 --- a/packages/intltool/intltool_0.30.bb +++ b/packages/intltool/intltool_0.30.bb @@ -1,12 +1 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" - -SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} +require intltool.inc diff --git a/packages/intltool/intltool_0.31.bb b/packages/intltool/intltool_0.31.bb index f1660e7262..e48262574b 100644 --- a/packages/intltool/intltool_0.31.bb +++ b/packages/intltool/intltool_0.31.bb @@ -1,12 +1 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" - -SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} +require intltool.inc diff --git a/packages/intltool/intltool_0.34.bb b/packages/intltool/intltool_0.34.bb index f1660e7262..e48262574b 100644 --- a/packages/intltool/intltool_0.34.bb +++ b/packages/intltool/intltool_0.34.bb @@ -1,12 +1 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" - -SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} +require intltool.inc diff --git a/packages/intltool/intltool_0.35.0.bb b/packages/intltool/intltool_0.35.0.bb index de8705ccf0..6dea51a5fc 100644 --- a/packages/intltool/intltool_0.35.0.bb +++ b/packages/intltool/intltool_0.35.0.bb @@ -1,18 +1,8 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" +require intltool.inc + DEPENDS = "libxml-parser-perl-native" #RDEPENDS = "libxml-parser-perl" PR = "r1" RRECOMMENDS = "perl-modules" - -SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/intltool/intltool_0.35.2.bb b/packages/intltool/intltool_0.35.2.bb index daba37a9da..6626ed54fe 100644 --- a/packages/intltool/intltool_0.35.2.bb +++ b/packages/intltool/intltool_0.35.2.bb @@ -1,18 +1,8 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" +require intltool.inc + DEPENDS = "libxml-parser-perl-native" #RDEPENDS = "libxml-parser-perl" PR = "r0" RRECOMMENDS = "perl-modules" - -SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb index 03a381387e..a0964d65b3 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb @@ -1,15 +1,14 @@ require ipkg-utils_${PV}.bb -SRC_URI += "file://ipkg-utils-fix.patch;patch=1 \ - file://ipkg-py-sane-vercompare.patch;patch=1" RDEPENDS = "" -PR = "r9" +PR = "r11" inherit native # Avoid circular dependencies from package_ipk.bbclass PACKAGES = "" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-utils" +INSTALL += "arfile.py" do_stage() { for i in ${INSTALL}; do diff --git a/packages/ipkg-utils/ipkg-utils/index_speedup.patch b/packages/ipkg-utils/ipkg-utils/index_speedup.patch deleted file mode 100644 index bef28a9df1..0000000000 --- a/packages/ipkg-utils/ipkg-utils/index_speedup.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: ipkg-utils/ipkg-make-index -=================================================================== ---- ipkg-utils.orig/ipkg-make-index 2005-03-20 18:10:54.000000000 +0000 -+++ ipkg-utils/ipkg-make-index 2006-07-24 09:18:16.000000000 +0100 -@@ -37,6 +37,21 @@ - if os.path.exists(pkg_dir + "/" + filename + ".asc"): - os.rename(pkg_dir + "/" + filename + ".asc", locale_dir + "/" + filename + ".asc") - -+def md5sum(file): -+ import md5 -+ sum = md5.new() -+ f = open(file, "r") -+ while 1: -+ data = f.read(1024) -+ if not data: break -+ sum.update(data) -+ f.close() -+ if sys.version[:1] > '2': -+ # when using Python 2.0 or newer -+ return sum.hexdigest() -+ else: -+ return string.join(map((lambda x:"%02x" % ord(x)),sum.digest()),'') -+ - old_filename = None - packages_filename = None - filelist_filename = "Packages.filelist" -@@ -87,7 +102,7 @@ - files.sort() - for filename in files: - basename = os.path.basename(filename) -- if old_pkg_hash.has_key(basename): -+ if old_pkg_hash.has_key(basename) and old_pkg_hash[basename].md5 == md5sum(filename) and old_pkg_hash[basename].size == os.stat(filename)[6]: - if (verbose): - sys.stderr.write("Found %s in Packages\n" % (filename,)) - pkg = old_pkg_hash[basename] -Index: ipkg-utils/ipkg.py -=================================================================== ---- ipkg-utils.orig/ipkg.py 2005-01-20 23:09:10.000000000 +0000 -+++ ipkg-utils/ipkg.py 2006-07-24 09:16:44.000000000 +0100 -@@ -210,8 +210,13 @@ - value = value + '\n' + line - if name == 'size': - self.size = int(value) -+ elif name == 'md5sum': -+ self.md5 = value - elif self.__dict__.has_key(name): - self.__dict__[name] = value -+ else: -+ print "Lost field %s, %s" % (name,value) -+ - if line[0] == '\n': - return # consumes one blank line at end of package descriptoin - else: diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch b/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch new file mode 100644 index 0000000000..9f9b9359ce --- /dev/null +++ b/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch @@ -0,0 +1,97 @@ +--- + ipkg-make-index | 31 +++++++++++++++++++++++++++---- + 1 file changed, 27 insertions(+), 4 deletions(-) + +Index: ipkg-utils/ipkg-make-index +=================================================================== +--- ipkg-utils.orig/ipkg-make-index 2007-05-26 23:45:56.000000000 +0100 ++++ ipkg-utils/ipkg-make-index 2007-05-26 23:47:25.000000000 +0100 +@@ -40,6 +40,7 @@ def to_locale(filename, locale): + old_filename = None + packages_filename = None + filelist_filename = "Packages.filelist" ++stamplist_filename = "Packages.stamps" + opt_s = 0 + opt_m = 0 + (opts, remaining_args) = getopt.getopt(sys.argv[1:], "hl:p:vsmr:L:") +@@ -50,6 +51,7 @@ for (optkey, optval) in opts: + opt_s = 1 + if optkey == '-p': + packages_filename = optval ++ stamplist_filename = optval + ".stamps" + if optkey == '-l': + filelist_filename = optval + if optkey == '-v': +@@ -72,6 +74,7 @@ old_pkg_hash = {} + if packages_filename and not old_filename and os.path.exists(packages_filename): + old_filename = packages_filename + ++pkgsStamps = {} + if old_filename: + if (verbose): + sys.stderr.write("Reading package list from " + old_filename + "\n") +@@ -80,6 +83,14 @@ if old_filename: + for k in old_packages.packages.keys(): + p = old_packages.packages[k] + old_pkg_hash[p.filename] = p ++ try: ++ f = open(stamplist_filename, "r") ++ for l in f: ++ l = l.strip() ++ s, f = l.split(" ", 1) ++ pkgsStamps[f] = int(s) ++ except IOError: ++ pass + + if (verbose): + sys.stderr.write("Reading in all the package info from %s\n" % (pkg_dir, )) +@@ -87,11 +98,17 @@ files=glob(pkg_dir + '/*.ipk') + glob(pk + files.sort() + for filename in files: + basename = os.path.basename(filename) ++ pkg = None ++ fnameStat = os.stat(filename) + if old_pkg_hash.has_key(basename): +- if (verbose): ++ if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]: ++ if (verbose): + sys.stderr.write("Found %s in Packages\n" % (filename,)) +- pkg = old_pkg_hash[basename] +- else: ++ pkg = old_pkg_hash[basename] ++ else: ++ sys.stderr.write("Found %s in Packages, but mtime differs - re-reading\n" % (filename,)) ++ ++ if not pkg: + if (verbose): + sys.stderr.write("Reading info for package %s\n" % (filename,)) + pkg = ipkg.Package(filename) +@@ -101,6 +118,7 @@ for filename in files: + else: + old_filename = "" + s = packages.add_package(pkg) ++ pkgsStamps[basename] = fnameStat.st_mtime + if s == 0: + if old_filename: + # old package was displaced by newer +@@ -114,6 +132,11 @@ for filename in files: + if opt_s: + print filename + ++pkgsStampsFile = open(stamplist_filename, "w") ++for f in pkgsStamps.keys(): ++ pkgsStampsFile.write("%d %s\n" % (pkgsStamps[f], f)) ++pkgsStampsFile.close() ++ + if opt_s: + sys.exit(0) + +@@ -154,7 +177,7 @@ if packages_filename: + os.rename(tmp_packages_filename, packages_filename) + os.rename(tmp_gzip_filename, gzip_filename) + +-if verbose: ++if verbose: + sys.stderr.write("Generate Packages.filelist file\n") + files = {} + names = packages.packages.keys() diff --git a/packages/ipkg-utils/ipkg-utils-native/ipkg-py-sane-vercompare.patch b/packages/ipkg-utils/ipkg-utils/ipkg-py-sane-vercompare.patch index 00ee391405..00ee391405 100644 --- a/packages/ipkg-utils/ipkg-utils-native/ipkg-py-sane-vercompare.patch +++ b/packages/ipkg-utils/ipkg-utils/ipkg-py-sane-vercompare.patch diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch new file mode 100644 index 0000000000..94c57f63f2 --- /dev/null +++ b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch @@ -0,0 +1,306 @@ +--- + arfile.py | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + ipkg.py | 106 ++++++++++++++++++++++++++--------------------------- + setup.py | 2 - + 3 files changed, 177 insertions(+), 55 deletions(-) + +Index: ipkg-utils/arfile.py +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ ipkg-utils/arfile.py 2007-05-26 23:46:59.000000000 +0100 +@@ -0,0 +1,124 @@ ++""" ++arfile - A module to parse GNU ar archives. ++ ++Copyright (c) 2006-7 Paul Sokolovsky ++This file is released under the terms ++of GNU General Public License v2 or later. ++""" ++import sys ++import os ++import tarfile ++ ++ ++class FileSection: ++ "A class which allows to treat portion of file as separate file object." ++ ++ def __init__(self, f, offset, size): ++ self.f = f ++ self.offset = offset ++ self.size = size ++ self.seek(0, 0) ++ ++ def seek(self, offset, whence = 0): ++# print "seek(%x, %d)" % (offset, whence) ++ if whence == 0: ++ return self.f.seek(offset + self.offset, whence) ++ elif whence == 1: ++ return self.f.seek(offset, whence) ++ elif whence == 2: ++ return self.f.seek(self.offset + self.size + offset, 0) ++ else: ++ assert False ++ ++ def tell(self): ++# print "tell()" ++ return self.f.tell() - self.offset ++ ++ def read(self, size = -1): ++# print "read(%d)" % size ++ return self.f.read(size) ++ ++class ArFile: ++ ++ def __init__(self, f): ++ self.f = f ++ self.directory = {} ++ self.directoryRead = False ++ ++ signature = self.f.readline() ++ assert signature == "!<arch>\n" ++ self.directoryOffset = self.f.tell() ++ ++ def open(self, fname): ++ if self.directory.has_key(fname): ++ return FileSection(self.f, self.directory[fname][-1], int(self.directory[fname][5])) ++ ++ if self.directoryRead: ++ raise IOError, (2, "AR member not found: " + fname) ++ ++ f = self._scan(fname) ++ if f == None: ++ raise IOError, (2, "AR member not found: " + fname) ++ return f ++ ++ ++ def _scan(self, fname): ++ self.f.seek(self.directoryOffset, 0) ++ ++ while True: ++ l = self.f.readline() ++ if not l: ++ self.directoryRead = True ++ return None ++ ++ if l == "\n": ++ l = self.f.readline() ++ if not l: break ++ descriptor = l.split() ++# print descriptor ++ size = int(descriptor[5]) ++ memberName = descriptor[0][:-1] ++ self.directory[memberName] = descriptor + [self.f.tell()] ++# print "read:", memberName ++ if memberName == fname: ++ # Record directory offset to start from next time ++ self.directoryOffset = self.f.tell() + size ++ return FileSection(self.f, self.f.tell(), size) ++ ++ # Skip data and loop ++ data = self.f.seek(size, 1) ++# print hex(f.tell()) ++ ++ ++if __name__ == "__main__": ++ if None: ++ f = open(sys.argv[1], "rb") ++ ++ ar = ArFile(f) ++ tarStream = ar.open("data.tar.gz") ++ print "--------" ++ tarStream = ar.open("data.tar.gz") ++ print "--------" ++ tarStream = ar.open("control.tar.gz") ++ print "--------" ++ tarStream = ar.open("control.tar.gz2") ++ ++ sys.exit(0) ++ ++ ++ dir = "." ++ if len(sys.argv) > 1: ++ dir = sys.argv[1] ++ for f in os.listdir(dir): ++ if not f.endswith(".ipk"): continue ++ ++ print "=== %s ===" % f ++ f = open(dir + "/" + f, "rb") ++ ++ ar = ArFile(f) ++ tarStream = ar.open("control.tar.gz") ++ tarf = tarfile.open("control.tar.gz", "r", tarStream) ++ #tarf.list() ++ ++ f2 = tarf.extractfile("control") ++ print f2.read() +Index: ipkg-utils/setup.py +=================================================================== +--- ipkg-utils.orig/setup.py 2007-05-26 23:45:55.000000000 +0100 ++++ ipkg-utils/setup.py 2007-05-26 23:46:59.000000000 +0100 +@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils + platforms = 'POSIX', + keywords = 'ipkg familiar', + url = 'http://www.handhelds.org/sources.html/', +- py_modules = [ 'ipkg' ], ++ py_modules = [ 'ipkg', 'arfile' ], + scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload'] + ) +Index: ipkg-utils/ipkg.py +=================================================================== +--- ipkg-utils.orig/ipkg.py 2007-05-26 23:46:55.000000000 +0100 ++++ ipkg-utils/ipkg.py 2007-05-26 23:45:20.000000000 +0100 +@@ -41,6 +41,8 @@ import re + import string + import commands + from stat import ST_SIZE ++import arfile ++import tarfile + + class Version: + """A class for holding parsed package version information.""" +@@ -131,78 +133,58 @@ class Package: + self.section = None + self.filename_header = None + self.file_list = [] +- self.md5 = None ++ # md5 is lazy attribute, computed on demand ++ #self.md5 = None + self.size = None + self.installed_size = None + self.filename = None + self.isdeb = 0 ++ self.fn = fn + + if fn: + # see if it is deb format +- f = open(fn, "r") ++ f = open(fn, "rb") + magic = f.read(4) +- f.close() ++ f.seek(0, 0) + if (magic == "!<ar"): + self.isdeb = 1 + +- # compute the MD5. +- f = open(fn, "r") +- sum = md5.new() +- while 1: +- data = f.read(1024) +- if not data: break +- sum.update(data) +- f.close() +- if sys.version[:1] > '2': +- # when using Python 2.0 or newer +- self.md5 = sum.hexdigest() +- else: +- self.md5 = string.join(map((lambda x:"%02x" % ord(x)),sum.digest()),'') +- stat = os.stat(fn) +- self.size = stat[ST_SIZE] ++ + self.filename = os.path.basename(fn) ++ assert self.isdeb == 1, "Old ipk format (non-deb) is unsupported" ++ + ## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) +- if self.isdeb: +- control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r") +- else: +- control = os.popen("tar xfzO "+fn+" 'control.tar.gz' | tar xfzO - './control'","r") +- line = control.readline() +- while 1: +- if not line: break +- line = string.rstrip(line) +- lineparts = re.match(r'([\w-]*?):\s*(.*)', line) +- if lineparts: +- name = string.lower(lineparts.group(1)) +- value = lineparts.group(2) +- while 1: +- line = control.readline() +- if not line: break +- if line[0] != ' ': break +- line = string.rstrip(line) +- value = value + '\n' + line +- # don't allow package to override its own filename +- if name == "filename": +- self.filename_header = value +- else: +- if self.__dict__.has_key(name): +- self.__dict__[name] = value +- else: +- line = control.readline() ++ ++ ar = arfile.ArFile(f) ++ tarStream = ar.open("control.tar.gz") ++ tarf = tarfile.open("control.tar.gz", "r", tarStream) ++ ++ control = tarf.extractfile("control") ++ self.read_control(control) + control.close() +- if self.isdeb: +- data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r") +- else: +- data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r") +- while 1: +- line = data.readline() +- if not line: break +- self.file_list.append(string.rstrip(line)) +- data.close() + + self.scratch_dir = None + self.file_dir = None + self.meta_dir = None + ++ def __getattr__(self, name): ++ if name == "md5": ++ self._computeFileMD5() ++ return self.md5 ++ else: ++ raise AttributeError, name ++ ++ def _computeFileMD5(self): ++ # compute the MD5. ++ f = open(self.fn, "rb") ++ sum = md5.new() ++ while 1: ++ data = f.read(1024) ++ if not data: break ++ sum.update(data) ++ f.close() ++ self.md5 = sum.hexdigest() ++ + def read_control(self, control): + import os + +@@ -221,9 +203,15 @@ class Package: + value = value + '\n' + line + if name == 'size': + self.size = int(value) ++ elif name == 'md5sum': ++ self.md5 = value + elif self.__dict__.has_key(name): + self.__dict__[name] = value +- if line[0] == '\n': ++ else: ++ #print "Lost field %s, %s" % (name,value) ++ pass ++ ++ if line and line[0] == '\n': + return # consumes one blank line at end of package descriptoin + else: + line = control.readline() +@@ -314,6 +302,16 @@ class Package: + return self.section + + def get_file_list(self): ++ if not self.fn: ++ return [] ++ f = open(self.fn, "rb") ++ ar = arfile.ArFile(f) ++ tarStream = ar.open("data.tar.gz") ++ tarf = tarfile.open("data.tar.gz", "r", tarStream) ++ self.file_list = tarf.getnames() ++ self.file_list = map(lambda a: ["./", ""][a.startswith("./")] + a, self.file_list) ++ ++ f.close() + return self.file_list + + def write_package(self, dirname): diff --git a/packages/ipkg-utils/ipkg-utils-native/ipkg-utils-fix.patch b/packages/ipkg-utils/ipkg-utils/ipkg-utils-fix.patch index a9e6fc4d05..b3e0d62cd9 100644 --- a/packages/ipkg-utils/ipkg-utils-native/ipkg-utils-fix.patch +++ b/packages/ipkg-utils/ipkg-utils/ipkg-utils-fix.patch @@ -1,11 +1,14 @@ ---- ../../../work/i686-linux/ipkg-utils-native-1.6+cvs20050404-r6/ipkg-utils/ipkg.py 2005-01-08 19:08:52.000000000 +0100 -+++ ipkg-utils/ipkg.py 2006-06-29 12:52:58.466446000 +0200 -@@ -150,11 +150,11 @@ - stat = os.stat(fn) - self.size = stat[ST_SIZE] +--- + ipkg.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: ipkg-utils/ipkg.py +=================================================================== +--- ipkg-utils.orig/ipkg.py 2007-05-26 23:49:05.000000000 +0100 ++++ ipkg-utils/ipkg.py 2007-05-26 23:49:23.000000000 +0100 +@@ -152,9 +152,9 @@ class Package: self.filename = os.path.basename(fn) -- ## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) -+ sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) + ## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) if self.isdeb: - control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r") + control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r") diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index 48c7445828..6ffe6fe679 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -5,10 +5,13 @@ LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" SRCDATE = "20050404" -PR = "r12" +PR = "r14" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ - file://index_speedup.patch;patch=1" + file://ipkg-utils-fix.patch;patch=1 \ + file://ipkg-py-sane-vercompare.patch;patch=1 \ + file://ipkg-py-tarfile.patch;patch=1 \ + file://ipkg-make-index-track-stamps.patch;patch=1" S = "${WORKDIR}/ipkg-utils" @@ -26,9 +29,3 @@ do_install() { done } -#FIXME: ipkg-utils is not allowed to have packages or else a ipkg-native -> ipkg-utils -> ipkg-utils -# recursive dependency is triggered. This has been fixed by installing the ipkg-link script in -# a dedicated package. -#PACKAGES_prepend = "ipkg-link " -#FILES_ipkg-link = "${bindir}/ipkg-link" - diff --git a/packages/keylaunch/files/makefile-fix.patch b/packages/keylaunch/files/makefile-fix.patch index 30275001df..d9c57e05ac 100644 --- a/packages/keylaunch/files/makefile-fix.patch +++ b/packages/keylaunch/files/makefile-fix.patch @@ -1,11 +1,15 @@ ---- /tmp/Makefile 2006-07-26 09:31:43.000000000 +0200 -+++ keylaunch-2.0.10/Makefile 2006-07-26 09:32:23.464411000 +0200 -@@ -31,7 +31,7 @@ +--- keylaunch-2.0.10/Makefile.orig 2007-05-25 18:13:39.000000000 +0200 ++++ keylaunch-2.0.10/Makefile 2007-05-25 18:15:47.000000000 +0200 +@@ -31,8 +31,10 @@ $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ install-program: all - install -sD $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG) -+ install -s -D $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG) - install -D -m 644 $(PROG)rc $(DESTDIR)/etc/$(PROG)rc +- install -D -m 644 $(PROG)rc $(DESTDIR)/etc/$(PROG)rc ++ install -d $(DESTDIR)$(PREFIX)/bin ++ install -s $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG) ++ install -d $(DESTDIR)/etc ++ install -m 644 $(PROG)rc $(DESTDIR)/etc/$(PROG)rc install -d $(DESTDIR)/etc/X11/Xsession.d install 90$(PROG) $(DESTDIR)/etc/X11/Xsession.d/90$(PROG) + install -d $(DESTDIR)/etc/X11/Xinit.d diff --git a/packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch b/packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch new file mode 100644 index 0000000000..3dd44bea27 --- /dev/null +++ b/packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch @@ -0,0 +1,22 @@ +--- SDL-1.2.9-orig/src/video/SDL_sysvideo.h.org 2005-04-17 10:40:41.000000000 +0000 ++++ SDL-1.2.9-orig/src/video/SDL_sysvideo.h 2007-05-25 07:34:38.000000000 +0000 +@@ -332,6 +332,9 @@ + SDL_VideoDevice *(*create)(int devindex); + } VideoBootStrap; + ++#ifdef __cplusplus ++extern "C" { ++#endif + #ifdef ENABLE_X11 + extern VideoBootStrap X11_bootstrap; + #endif +@@ -417,6 +420,9 @@ + #ifdef ENABLE_RISCOS + extern VideoBootStrap RISCOS_bootstrap; + #endif ++#ifdef __cplusplus ++}; ++#endif + /* This is the current video device */ + extern SDL_VideoDevice *current_video; + diff --git a/packages/libsdl/libsdl-qpe-1.2.9/no-PAGE_SIZE.patch b/packages/libsdl/libsdl-qpe-1.2.9/no-PAGE_SIZE.patch new file mode 100644 index 0000000000..856aaf2472 --- /dev/null +++ b/packages/libsdl/libsdl-qpe-1.2.9/no-PAGE_SIZE.patch @@ -0,0 +1,11 @@ +--- SDL-1.2.9-orig/src/video/qtopia/SDL_sysvideo.cc.org 2007-05-25 07:07:32.000000000 +0000 ++++ SDL-1.2.9-orig/src/video/qtopia/SDL_sysvideo.cc 2007-05-25 07:24:48.000000000 +0000 +@@ -809,7 +809,7 @@ + current->pitch = finfo.line_length; + current->flags = (SDL_FULLSCREEN|SDL_HWSURFACE); + mapped_offset = (((long)finfo.smem_start) - +- (((long)finfo.smem_start)&~(PAGE_SIZE-1))); ++ (((long)finfo.smem_start)&~(getpagesize()-1))); + mapped_memlen = finfo.smem_len+mapped_offset; + if(console_fd >0 ) { + mapped_mem = mmap(NULL, mapped_memlen,PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); diff --git a/packages/libsdl/libsdl-qpe_1.2.9.bb b/packages/libsdl/libsdl-qpe_1.2.9.bb index eaca6b88aa..2fbf66b5d8 100644 --- a/packages/libsdl/libsdl-qpe_1.2.9.bb +++ b/packages/libsdl/libsdl-qpe_1.2.9.bb @@ -6,7 +6,7 @@ PROVIDES = "virtual/libsdl" LICENSE = "LGPL" # NOTE: make sure to keep PR in sync with libsdl-x11 -PR = "r0" +PR = "r1" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://agawa-piro-mickey-1.2.9.patch;patch=1 \ @@ -16,6 +16,8 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://ipaq-1.2.9.patch;patch=1 \ file://SDL-Akita-1.2.9.patch;patch=1 \ file://fixlibs-1.2.9.patch;patch=1 \ + file://no-PAGE_SIZE.patch;patch=1 \ + file://explicit-extern-C.patch;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/SDL-${PV}" diff --git a/packages/ipkg-utils/ipkg-utils-native/.mtn2git_empty b/packages/linux/linux/kb9202/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ipkg-utils/ipkg-utils-native/.mtn2git_empty +++ b/packages/linux/linux/kb9202/.mtn2git_empty diff --git a/packages/linux/linux/kb9202/defconfig b/packages/linux/linux/kb9202/defconfig new file mode 100644 index 0000000000..c16537d9d6 --- /dev/null +++ b/packages/linux/linux/kb9202/defconfig @@ -0,0 +1,780 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.13-rc2 +# Sun Aug 14 19:26:59 2005 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y + +# +# Code maturity level options +# +# CONFIG_EXPERIMENTAL is not set +CONFIG_CLEAN_COMPILE=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +# CONFIG_SWAP is not set +# CONFIG_SYSVIPC is not set +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_HOTPLUG=y +# CONFIG_KOBJECT_UEVENT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SHMEM=y +CONFIG_CC_ALIGN_FUNCTIONS=0 +CONFIG_CC_ALIGN_LABELS=0 +CONFIG_CC_ALIGN_LOOPS=0 +CONFIG_CC_ALIGN_JUMPS=0 +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_OBSOLETE_MODPARM=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +CONFIG_ARCH_AT91=y +CONFIG_ARCH_AT91RM9200=y + +# +# AT91RM9200 Implementations +# +# CONFIG_ARCH_AT91RM9200DK is not set +# CONFIG_MACH_AT91RM9200EK is not set +# CONFIG_MACH_CSB337 is not set +# CONFIG_MACH_CSB637 is not set +# CONFIG_MACH_CARMEVA is not set +CONFIG_MACH_KB9200=y + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM920T=y +CONFIG_CPU_32v4=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_CACHE_V4WT=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set + +# +# Bus support +# +CONFIG_ISA_DMA_API=y + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_NO_IDLE_HZ is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x10000000 +CONFIG_ZBOOT_ROM_BSS=0x20040000 +CONFIG_ZBOOT_ROM=y +CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram rw initrd=0x20210000,654933" + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_AOUT=y +CONFIG_BINFMT_MISC=y +# CONFIG_ARTHUR is not set + +# +# Power management options +# +# CONFIG_PM is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set +CONFIG_DEBUG_DRIVER=y + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_NBD=y +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CDROM_PKTCDVD is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_ATA_OVER_ETH is not set + +# +# SCSI device support +# +CONFIG_SCSI=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI Transport Attributes +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set + +# +# SCSI low-level drivers +# +# CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_DEBUG is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Networking support +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_IP_TCPDIAG is not set +# CONFIG_IP_TCPDIAG_IPV6 is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +# CONFIG_IPV6 is not set +# CONFIG_NETFILTER is not set +# CONFIG_BRIDGE is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set +# CONFIG_NET_CLS_ROUTE is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_ARM_AT91_ETHER=y +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_AT91RM9200_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_AT91_SPI is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# Misc devices +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +# CONFIG_FB is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB=y +CONFIG_USB_DEBUG=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_BLUETOOTH_TTY is not set +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE_DEBUG=y +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_DPCM is not set + +# +# USB Input Devices +# +# CONFIG_USB_HID is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_MTOUCH is not set +# CONFIG_USB_ITMTOUCH is not set +# CONFIG_USB_EGALAX is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MICROTEK is not set + +# +# USB Multimedia devices +# +# CONFIG_USB_DABUSB is not set + +# +# Video4Linux support is needed for USB Multimedia device support +# + +# +# USB Network Adapters +# +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_USBNET is not set +# CONFIG_USB_MON is not set + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGETKIT is not set +# CONFIG_USB_PHIDGETSERVO is not set +# CONFIG_USB_IDMOUSE is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +# CONFIG_EXT2_FS_POSIX_ACL is not set +# CONFIG_EXT2_FS_SECURITY is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set + +# +# XFS support +# +# CONFIG_XFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_DEVPTS_FS_XATTR=y +# CONFIG_DEVPTS_FS_SECURITY is not set +CONFIG_TMPFS=y +# CONFIG_TMPFS_XATTR is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y + +# +# Miscellaneous filesystems +# +# CONFIG_HFSPLUS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=y +# CONFIG_NLS_ISO8859_1 is not set +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_UTF8 is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +CONFIG_FRAME_POINTER=y +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +# CONFIG_CRC_CCITT is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set diff --git a/packages/linux/linux_2.6.21.bb b/packages/linux/linux_2.6.21.bb index d801f88507..7416d5d859 100644 --- a/packages/linux/linux_2.6.21.bb +++ b/packages/linux/linux_2.6.21.bb @@ -1,9 +1,12 @@ DESCRIPTION = "Linux Kernel" SECTION = "kernel" LICENSE = "GPL" +DEPENDS_kb9202 = "u-boot" +PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://defconfig" + file://defconfig \ + " SRC_URI_append_simpad = "\ file://linux-2.6.21-SIMpad-cs3-simpad.patch;patch=1 \ @@ -12,12 +15,27 @@ SRC_URI_append_simpad = "\ file://linux-2.6.21-SIMpad-ucb1x00-switches.patch;patch=1 \ file://linux-2.6.21-pcmcia-device-to-platform-driver.patch;patch=1 \ " +SRC_URI_append_kb9202 = "http://maxim.org.za/AT91RM9200/2.6/2.6.21-at91.patch.gz;patch=1" inherit kernel +KERNEL_IMAGETYPE_progear = "bzImage" KERNEL_IMAGETYPE_simpad = "zImage" +KERNEL_IMAGETYPE_kb9202 = "uImage" do_configure_prepend() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' + + yes '' | oe_runmake oldconfig } diff --git a/packages/lirc/lirc-modules_0.8.1+cvs20070307.bb b/packages/lirc/lirc-modules_0.8.1+cvs20070307.bb index 5b11f32369..3ecfb76b3c 100644 --- a/packages/lirc/lirc-modules_0.8.1+cvs20070307.bb +++ b/packages/lirc/lirc-modules_0.8.1+cvs20070307.bb @@ -7,7 +7,8 @@ DEPENDS = "virtual/kernel fakeroot-native setserial" RDEPENDS_nslu2 = "setserial" PR = "r0" -DEFAULT_PREFERENCE = "-1" +# enable this bb file until the other packages compile again +#DEFAULT_PREFERENCE = "-1" SRCDATE=${@bb.data.getVar('PV', d, 1)[9:]} diff --git a/packages/lirc/lirc_0.8.1+cvs20070307.bb b/packages/lirc/lirc_0.8.1+cvs20070307.bb index e32477673e..61f7019b2e 100644 --- a/packages/lirc/lirc_0.8.1+cvs20070307.bb +++ b/packages/lirc/lirc_0.8.1+cvs20070307.bb @@ -17,7 +17,8 @@ RDEPENDS_lirc-nslu2example = "lirc lirc-exec" RRECOMMENDS_lirc = "lirc-exec" PR = "r1" -DEFAULT_PREFERENCE = "-1" +# enable cvs version since until compilation issues for other packages have been fixed (cf. bug 2284 et al). +#DEFAULT_PREFERENCE = "-1" SRCDATE=${@bb.data.getVar('PV', d, 1)[9:]} diff --git a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb index 3380a4e00c..c279893ee5 100644 --- a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb +++ b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb @@ -1,22 +1,24 @@ DESCRIPTION = "Library and test program for decoding mpeg-2 and mpeg-1 video streams" HOMEPAGE = "http://libmpeg2.sourceforge.net/" -LICENSE = "GPL" -PRIORITY = "optional" SECTION = "libs" -PR = "r2" - +PRIORITY = "optional" +LICENSE = "GPL" DEPENDS = "virtual/libsdl" +PROVIDES += "libmpeg2" +RPROVIDES += "libmpeg2" +PR = "r3" -SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz" S = "${WORKDIR}/mpeg2dec-0.4.0" +SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz" + inherit autotools pkgconfig EXTRA_OECONF = "--enable-shared" -PACKAGES = "mpeg2dec mpeg2dec-doc libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev" +PACKAGES += "libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev" -FILES_${PN} = "${bindir}/*" +FILES_${PN} += "${bindir}/*" FILES_libmpeg2 = "${libdir}/libmpeg2.so.*" FILES_libmpeg2convert = "${libdir}/libmpeg2convert.so.*" FILES_libmpeg2-dev = "${libdir}/libmpeg2.so \ diff --git a/packages/opie-tinykate/opie-tinykate.inc b/packages/opie-tinykate/opie-tinykate.inc index aeb2fddad8..7d700cb0dd 100644 --- a/packages/opie-tinykate/opie-tinykate.inc +++ b/packages/opie-tinykate/opie-tinykate.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libqtaux2" APPNAME = "tinykate" - +PR = "r1" S = "${WORKDIR}/tinykate" @@ -23,7 +23,7 @@ do_install() { install -m 0644 ${WORKDIR}/share/${APPNAME}/syntax/*.* ${D}${palmtopdir}/share/${APPNAME}/syntax/ } -PACKAGES = " \ +PACKAGES += " \ opie-tinykate-syntax-commondev \ opie-tinykate-syntax-documentation \ opie-tinykate-syntax-misc \ diff --git a/packages/opie-tinykate/opie-tinykate_1.2.2.bb b/packages/opie-tinykate/opie-tinykate_1.2.2.bb index e964a4886e..528848b356 100644 --- a/packages/opie-tinykate/opie-tinykate_1.2.2.bb +++ b/packages/opie-tinykate/opie-tinykate_1.2.2.bb @@ -1,7 +1,5 @@ require ${PN}.inc - - SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ diff --git a/packages/pcmciautils/pcmciautils-014/makefile_fix.patch b/packages/pcmciautils/pcmciautils-014/makefile_fix.patch index fed5d37bf8..f5bb64b9bd 100644 --- a/packages/pcmciautils/pcmciautils-014/makefile_fix.patch +++ b/packages/pcmciautils/pcmciautils-014/makefile_fix.patch @@ -13,3 +13,76 @@ Index: pcmciautils-014/Makefile INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} +--- pcmciautils-014/Makefile~ 2007-05-25 19:40:39.000000000 +0200 ++++ pcmciautils-014/Makefile 2007-05-25 19:40:39.000000000 +0200 +@@ -258,28 +258,29 @@ + + install-hotplug: + $(INSTALL) -d $(DESTDIR)$(hotplugdir) +- $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent +- $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc ++ $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent ++ $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc + + uninstall-hotplug: + - rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc + + install-socket-hotplug: +- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent +- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc ++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent ++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc + + uninstall-socket-hotplug: + - rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc + install-socket-tools: +- $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP) ++ $(INSTALL) -d $(DESTDIR)$(sbindir) ++ $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP) + + uninstall-socket-tools: + - rm -f $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP) + + install-tools: + $(INSTALL) -d $(DESTDIR)$(sbindir) +- $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) +- $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS) ++ $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) ++ $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS) + $(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA) + + uninstall-tools: +@@ -289,18 +290,20 @@ + + install-config: + $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) +- $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts ++ $(INSTALL_DATA) config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts + + uninstall-config: + # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts + + install-udev: +- $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules ++ $(INSTALL) -d $(DESTDIR)$(udevrulesdir) ++ $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules + + uninstall-udev: + - rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules + + install-man: ++ $(INSTALL) -d $(DESTDIR)$(mandir)/man8 + $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 + $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8 + +--- pcmciautils-014/Makefile~ 2007-05-25 19:43:01.000000000 +0200 ++++ pcmciautils-014/Makefile 2007-05-25 19:43:01.000000000 +0200 +@@ -304,7 +304,7 @@ + + install-man: + $(INSTALL) -d $(DESTDIR)$(mandir)/man8 +- $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 ++ $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 + $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8 + + uninstall-man: diff --git a/packages/pointercal/files/h2200/pointercal b/packages/pointercal/files/h2200/pointercal deleted file mode 100644 index 13329047d8..0000000000 --- a/packages/pointercal/files/h2200/pointercal +++ /dev/null @@ -1 +0,0 @@ -23214 147 -3929622 156 -28248 24825082 65536 diff --git a/packages/pointercal/files/hx4700/.mtn2git_empty b/packages/pointercal/files/hx4700/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/pointercal/files/hx4700/.mtn2git_empty +++ /dev/null diff --git a/packages/pointercal/files/hx4700/pointercal b/packages/pointercal/files/hx4700/pointercal deleted file mode 100644 index 62b97378a9..0000000000 --- a/packages/pointercal/files/hx4700/pointercal +++ /dev/null @@ -1 +0,0 @@ --1109 0 33398576 7 1479 -3859852 65536 diff --git a/packages/pointercal/files/magician/.mtn2git_empty b/packages/pointercal/files/magician/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/pointercal/files/magician/.mtn2git_empty +++ /dev/null diff --git a/packages/pointercal/files/magician/pointercal b/packages/pointercal/files/magician/pointercal deleted file mode 100644 index 7ea2d11310..0000000000 --- a/packages/pointercal/files/magician/pointercal +++ /dev/null @@ -1 +0,0 @@ --553 0 16838922 0 -718 22062080 65536 diff --git a/packages/pointercal/pointercal_0.0.bb b/packages/pointercal/pointercal_0.0.bb index 7d47cb8d78..563e62900e 100644 --- a/packages/pointercal/pointercal_0.0.bb +++ b/packages/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r0" +PR = "r1" SRC_URI = "file://pointercal" S = "${WORKDIR}" diff --git a/packages/scummvm/scummvm-qpe_0.6.1b.bb b/packages/scummvm/scummvm-qpe_0.6.1b.bb index 50d107deeb..b66d58671a 100644 --- a/packages/scummvm/scummvm-qpe_0.6.1b.bb +++ b/packages/scummvm/scummvm-qpe_0.6.1b.bb @@ -1,7 +1,8 @@ require scummvm.inc + DEPENDS = "libsdl-qpe libmad tremor libogg zlib mpeg2dec" -S="${WORKDIR}/scummvm-${PV}/" +S = "${WORKDIR}/scummvm-${PV}/" do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 24b1e5a12a..28257fab4b 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -3,7 +3,7 @@ SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI = "http://puzzle.dl.sourceforge.net/scummvm/scummvm-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2" inherit autotools diff --git a/packages/pointercal/files/h2200/.mtn2git_empty b/packages/sqlite/sqlite3-3.3.17/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/pointercal/files/h2200/.mtn2git_empty +++ b/packages/sqlite/sqlite3-3.3.17/.mtn2git_empty diff --git a/packages/sqlite/sqlite3-3.3.17/libtool.patch b/packages/sqlite/sqlite3-3.3.17/libtool.patch new file mode 100644 index 0000000000..ccf9993ed2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.3.17/libtool.patch @@ -0,0 +1,25 @@ +Index: sqlite-3.2.1/Makefile.in +=================================================================== +--- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 ++++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 +@@ -15,7 +15,10 @@ + # The toplevel directory of the source tree. This is the directory + # that contains this "Makefile.in" and the "configure.in" script. + # +-TOP = @srcdir@ ++TOP = $(srcdir) ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = . + + # C Compiler and options for use in building executables that + # will run on the platform that is doing the build. +@@ -96,7 +99,7 @@ + exec_prefix = @exec_prefix@ + libdir = @libdir@ + INSTALL = @INSTALL@ +-LIBTOOL = ./libtool ++LIBTOOL = @LIBTOOL@ + ALLOWRELEASE = @ALLOWRELEASE@ + + # libtool compile/link/install diff --git a/packages/sqlite/sqlite3.inc b/packages/sqlite/sqlite3.inc index 01290c2e41..68cc3e1c33 100644 --- a/packages/sqlite/sqlite3.inc +++ b/packages/sqlite/sqlite3.inc @@ -5,9 +5,8 @@ DEPENDS = "readline ncurses" LICENSE = "PD" SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ - file://cross-compile.patch;patch=1 \ - file://libtool.patch;patch=1 \ - file://ldflags.patch;patch=1" + file://libtool.patch;patch=1" + S = "${WORKDIR}/sqlite-${PV}" inherit autotools pkgconfig diff --git a/packages/sqlite/sqlite3_3.3.12.bb b/packages/sqlite/sqlite3_3.3.12.bb index 59c13ee01f..3d642f0ffc 100644 --- a/packages/sqlite/sqlite3_3.3.12.bb +++ b/packages/sqlite/sqlite3_3.3.12.bb @@ -1,2 +1,3 @@ require sqlite3.inc -PR = "r0" +PR = "r1" +SRC_URI += "file://cross-compile.patch;patch=1 file://ldflags.patch;patch=1" diff --git a/packages/sqlite/sqlite3_3.3.13.bb b/packages/sqlite/sqlite3_3.3.13.bb index 59c13ee01f..3d642f0ffc 100644 --- a/packages/sqlite/sqlite3_3.3.13.bb +++ b/packages/sqlite/sqlite3_3.3.13.bb @@ -1,2 +1,3 @@ require sqlite3.inc -PR = "r0" +PR = "r1" +SRC_URI += "file://cross-compile.patch;patch=1 file://ldflags.patch;patch=1" diff --git a/packages/sqlite/sqlite3_3.3.17.bb b/packages/sqlite/sqlite3_3.3.17.bb new file mode 100644 index 0000000000..cee00874bd --- /dev/null +++ b/packages/sqlite/sqlite3_3.3.17.bb @@ -0,0 +1,3 @@ +require sqlite3.inc +PR = "r0" + diff --git a/packages/telepathy/empathy_0.5.bb b/packages/telepathy/empathy_0.5.bb new file mode 100644 index 0000000000..39cccfbdf0 --- /dev/null +++ b/packages/telepathy/empathy_0.5.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Empathy: a Telepathy based IM client" +HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" +LICENSE = "GPL" +DEPENDS = "libgnomeui telepathy-mission-control libtelepathy gtk+ gconf libglade" +RDEPENDS = "telepathy-mission-control" +RRECOMMENDS = "telepathy-gabble" + +PR="r0" + +inherit gnome + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/empathy/0.5/empathy-${PV}.tar.bz2 \ + " + +FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \ + ${datadir}/dbus-1/services/*.service \ + ${datadir}/telepathy/managers/*.chandler \ + ${datadir}/icons" |