From 5413782b08e9f71457065e5c6bb4afec7536d319 Mon Sep 17 00:00:00 2001 From: Mustafa Yuecel Date: Fri, 29 Sep 2006 11:41:01 +0000 Subject: slugos and unslung distro: move distro-related variables out of machine config - changes discussed in mailinglist (thread: Cosmetic changes in SlugOS ...) --- conf/distro/include/slugos.inc | 11 +++++++++++ conf/distro/unslung.conf | 12 ++++++++++++ conf/machine/include/ixp4xx.conf | 16 ---------------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 3993bf6ec0..e015314d92 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -185,5 +185,16 @@ PREFERRED_VERSION_wpa-supplicant ?= "0.5.1" PREFERRED_PROVIDER_virtual/db = "db" PREFERRED_PROVIDER_virtual/db-native = "db-native" +SRCDATE_ipkg-utils ?= "20060106" +SRCDATE_ipkg-utils-native ?= "20060106" +SRCDATE_ipkg-link ?= "20060106" +SRCDATE_irssi ?= "20050930" + +CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" +INHERIT += "nslu2-mirrors" + +PREFERRED_VERSION_ipkg ?= "0.99.154" +PREFERRED_VERSION_ipkg-native ?= "0.99.154" + #FIXME: HACK: REMOVE THIS IGNORE_STRIP_ERRORS = "" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index da1efa9cc4..541eaef852 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -63,3 +63,15 @@ PREFERRED_VERSION_unslung-rootfs ?= "2.3r63" PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r63" PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r63" + +SRCDATE_ipkg-utils ?= "20060106" +SRCDATE_ipkg-utils-native ?= "20060106" +SRCDATE_ipkg-link ?= "20060106" +SRCDATE_irssi ?= "20050930" + +CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" +INHERIT += "nslu2-mirrors" + +PREFERRED_VERSION_ipkg ?= "0.99.154" +PREFERRED_VERSION_ipkg-native ?= "0.99.154" + diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 93befb92ce..541d350f21 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -148,22 +148,6 @@ IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \ # versions. IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}" -#------------------------------------------------------------------------------- -# Package versions -#------------------------------------------------------------------------------- -# Warning: these are shared across the different machine and distro -# configurations but can be overridden therein if required. -SRCDATE_ipkg-utils ?= "20060106" -SRCDATE_ipkg-utils-native ?= "20060106" -SRCDATE_ipkg-link ?= "20060106" -SRCDATE_irssi ?= "20050930" - -CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" -INHERIT += "nslu2-mirrors" - -PREFERRED_VERSION_ipkg ?= "0.99.154" -PREFERRED_VERSION_ipkg-native ?= "0.99.154" - #------------------------------------------------------------------------------- # Board defaults #------------------------------------------------------------------------------- -- cgit v1.2.3 From e3e8dee6b053ae5038e942554c44ac3cbab2a9d3 Mon Sep 17 00:00:00 2001 From: Mustafa Yuecel Date: Fri, 29 Sep 2006 11:44:35 +0000 Subject: bluez-hcidump: add version 1.32 --- packages/bluez/bluez-hcidump_1.32.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/bluez/bluez-hcidump_1.32.bb diff --git a/packages/bluez/bluez-hcidump_1.32.bb b/packages/bluez/bluez-hcidump_1.32.bb new file mode 100644 index 0000000000..877c8db33c --- /dev/null +++ b/packages/bluez/bluez-hcidump_1.32.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" +S = "${WORKDIR}/bluez-hcidump-${PV}" + +EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" + +inherit autotools -- cgit v1.2.3 From 17e83dfcd5c68dc92a6ed0b6b398c680dbb889ed Mon Sep 17 00:00:00 2001 From: Mustafa Yuecel Date: Fri, 29 Sep 2006 11:49:45 +0000 Subject: subversion: remove (non-preferred) version 1.3.2, add (non-preferred) version 1.4.0 --- packages/subversion/subversion_1.3.2.bb | 23 ----------------------- packages/subversion/subversion_1.4.0.bb | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 packages/subversion/subversion_1.3.2.bb create mode 100644 packages/subversion/subversion_1.4.0.bb diff --git a/packages/subversion/subversion_1.3.2.bb b/packages/subversion/subversion_1.3.2.bb deleted file mode 100644 index f508381d15..0000000000 --- a/packages/subversion/subversion_1.3.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "The Subversion (svn) client" -SECTION = "console/network" -DEPENDS = "apr-util-0.9.12 neon" -MAINTAINER = "Mustafa Yuecel " -LICENSE = "Apache/BSD" -HOMEPAGE = "http://subversion.tigris.org" -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ - file://disable-revision-install.patch;patch=1" - -EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \ - --without-berkeley-db --without-apxs --without-apache \ - --without-swig --with-apr=${STAGING_BINDIR} \ - --with-apr-util=${STAGING_BINDIR}" - -inherit autotools - -do_configure() { - oe_runconf -} diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb new file mode 100644 index 0000000000..f508381d15 --- /dev/null +++ b/packages/subversion/subversion_1.4.0.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "The Subversion (svn) client" +SECTION = "console/network" +DEPENDS = "apr-util-0.9.12 neon" +MAINTAINER = "Mustafa Yuecel " +LICENSE = "Apache/BSD" +HOMEPAGE = "http://subversion.tigris.org" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ + file://disable-revision-install.patch;patch=1" + +EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \ + --without-berkeley-db --without-apxs --without-apache \ + --without-swig --with-apr=${STAGING_BINDIR} \ + --with-apr-util=${STAGING_BINDIR}" + +inherit autotools + +do_configure() { + oe_runconf +} -- cgit v1.2.3 From de5dd12928f71908b27e59ef82e3a0decd32c1a9 Mon Sep 17 00:00:00 2001 From: Mustafa Yuecel Date: Fri, 29 Sep 2006 13:33:27 +0000 Subject: slugos-packages: remove bluez-libs - this line will cause the building of two bluez-libs versions (e.g. 2.25 and 3.4) - bluez-utils-nodbus depends on bluez-libs-${PV}, so this line is obsolete --- packages/meta/slugos-packages.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index bf1f448769..2d923c8acb 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -34,7 +34,6 @@ SLUGOS_PACKAGES = "\ bind \ binutils \ bison \ - bluez-libs \ bluez-utils-nodbus \ bridge-utils \ bzip2 \ -- cgit v1.2.3 From 1c80614c1cb1aea1f87d033d17c6bc51a7b7bad7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 Sep 2006 19:06:21 +0000 Subject: xournal: fix SRC_URI --- packages/xournal/xournal_0.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xournal/xournal_0.2.bb b/packages/xournal/xournal_0.2.bb index cd85a01f37..71299513e9 100644 --- a/packages/xournal/xournal_0.2.bb +++ b/packages/xournal/xournal_0.2.bb @@ -1,4 +1,4 @@ -HOMEPAGE = "http://www-math.mit.edu/~auroux/software/xournal/" +HOMEPAGE = "http://xournal.sf.net/" DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus." MAINTAINER = "Koen Kooi " DEPENDS = "gtk+ libgnomecanvas" @@ -6,7 +6,7 @@ SECTION = "x11" LICENSE = "GPL" PR = "r1" -SRC_URI = "http://math.mit.edu/~auroux/software/xournal/xournal.tar.gz \ +SRC_URI = "http://xournal.sourceforge.net/xournal-0.2.tar.gz \ file://no-printing.diff;patch=1" inherit autotools pkgconfig -- cgit v1.2.3 From 905dbfb7f99775d508d89de2d69f1b026033661d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 Sep 2006 19:09:33 +0000 Subject: xournal: add 0.3.1 --- packages/xournal/xournal_0.3.1.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/xournal/xournal_0.3.1.bb diff --git a/packages/xournal/xournal_0.3.1.bb b/packages/xournal/xournal_0.3.1.bb new file mode 100644 index 0000000000..3ab60725d6 --- /dev/null +++ b/packages/xournal/xournal_0.3.1.bb @@ -0,0 +1,12 @@ +HOMEPAGE = "http://xournal.sf.net/" +DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus." +MAINTAINER = "Koen Kooi " +DEPENDS = "gtk+ libgnomecanvas" +SECTION = "x11" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://xournal.sourceforge.net/xournal-0.3.1.tar.gz \ + " + +inherit autotools pkgconfig -- cgit v1.2.3 From 0a8de950d944b9cf635954c8df028c697ceee5be Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 29 Sep 2006 20:08:36 +0000 Subject: sane-srcdates.inc: Remove duplicate SRCDATE_xcalibrate, use teh same date as xcalibrateext. --- conf/distro/include/sane-srcdates.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 0696ad1909..fb753dc85e 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -5,7 +5,6 @@ SRCDATE_at76c503a-modules ?= "20060814" SRCDATE_prism54-module ?= "20060814" # X11 libs, extentions and protos -SRCDATE_xcalibrate ?= "20060804" SRCDATE_compositeext ?= "20060814" SRCDATE_drm ?= "20060814" SRCDATE_drm-kernel ?= "20060814" -- cgit v1.2.3 From 0d4e5824544fd99dff585af2a0075f0be6ca709f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 29 Sep 2006 20:32:18 +0000 Subject: tcl: fix dirs in tclConfig.sh so tcl related stuff will be buildable after cleaning WORKDIR --- packages/tcltk/tcl_8.4.11.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/tcltk/tcl_8.4.11.bb b/packages/tcltk/tcl_8.4.11.bb index 59d4162e53..f2eed37667 100644 --- a/packages/tcltk/tcl_8.4.11.bb +++ b/packages/tcltk/tcl_8.4.11.bb @@ -2,11 +2,12 @@ DESCRIPTION = "Tool Command Language" LICENSE = "tcl" SECTION = "devel/tcltk" HOMEPAGE = "http://tcl.sourceforge.net" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ file://tcl-add-soname.patch;patch=1 \ file://fix-configure.patch;patch=1;pnum=2" + S = "${WORKDIR}/tcl${PV}/unix" inherit autotools @@ -25,6 +26,7 @@ do_compile_prepend() { do_stage() { oe_libinstall -a libtclstub8.4 ${STAGING_LIBDIR} oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR} + sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh install -m 0755 tclConfig.sh ${STAGING_BINDIR} cd .. for dir in compat generic unix -- cgit v1.2.3 From c62509d5242fcec2865b0115aae60435239db294 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 29 Sep 2006 20:32:52 +0000 Subject: tk: fix dirs in tkConfig.sh so tk related stuff will be buildable after cleaning WORKDIR --- packages/tcltk/tk_8.4.11.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb index 69a3227437..e70db703e9 100644 --- a/packages/tcltk/tk_8.4.11.bb +++ b/packages/tcltk/tk_8.4.11.bb @@ -4,12 +4,13 @@ SECTION = "devel/tcltk" HOMEPAGE = "http://tcl.sourceforge.net" DEPENDS = "tcl virtual/libx11 libxt" RDEPENDS = "tcl" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ file://disable-xim.patch;patch=1;pnum=0 \ file://tk-add-soname.patch;patch=1 \ file://fix-configure.patch;patch=1;pnum=2" + S = "${WORKDIR}/tk${PV}/unix" inherit autotools @@ -25,6 +26,7 @@ do_configure() { do_stage() { oe_libinstall -a libtkstub8.4 ${STAGING_LIBDIR} oe_libinstall -so libtk8.4 ${STAGING_LIBDIR} + sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tkConfig.sh install -m 0755 tkConfig.sh ${STAGING_BINDIR} cd .. #for dir in compat generic unix -- cgit v1.2.3 From 4b69b9a224b6533f7334aee7d6c788ec575f1ff8 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 29 Sep 2006 20:50:38 +0000 Subject: xcalibrateext_git: Add latest xcalibrateext from X.org's git. * Replaces CVS version, moved away yesterday. * Actually X.org package now named xcalibrateproto. --- packages/xcalibrateext/xcalibrateext_git.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/xcalibrateext/xcalibrateext_git.bb diff --git a/packages/xcalibrateext/xcalibrateext_git.bb b/packages/xcalibrateext/xcalibrateext_git.bb new file mode 100644 index 0000000000..40c21ebd74 --- /dev/null +++ b/packages/xcalibrateext/xcalibrateext_git.bb @@ -0,0 +1,13 @@ +PV = "0.0+git${SRCDATE}" +SECTION = "x11/libs" +LICENSE = "BSD-X" +DESCRIPTION = "XCalibrate extension headers" + +SRC_URI = "git://anongit.freedesktop.org/xorg/proto/calibrateproto;protocol=git" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 79a652089c63bd0b00f794ebb2790ab50499c68f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 29 Sep 2006 21:38:40 +0000 Subject: libxml: added 2.6.26 --- packages/libxml/libxml2_2.6.26.bb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/libxml/libxml2_2.6.26.bb diff --git a/packages/libxml/libxml2_2.6.26.bb b/packages/libxml/libxml2_2.6.26.bb new file mode 100644 index 0000000000..192eb14275 --- /dev/null +++ b/packages/libxml/libxml2_2.6.26.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "GNOME XML library" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "MIT" + +SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz" + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n" + +do_stage() { + autotools_stage_all + install -m 0644 libxml.m4 ${STAGING_DATADIR}/aclocal/ +} + +python populate_packages_prepend () { + # autonamer would call this libxml2-2, but we don't want that + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_libxml2', 'libxml2', d) +} + +PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" + +FILES_${PN}-dev += "${bindir}/*-config" +FILES_${PN}-utils += "${bindir}/*" -- cgit v1.2.3 From 188250803922b2887bf4f6b66f9a88d4f49db75c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 29 Sep 2006 21:39:32 +0000 Subject: libxslt: added 1.1.17 --- packages/libxslt/libxslt-1.1.17/.mtn2git_empty | 0 packages/libxslt/libxslt-1.1.17/destdir.patch | 10 ++++++ packages/libxslt/libxslt_1.1.17.bb | 45 ++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 packages/libxslt/libxslt-1.1.17/.mtn2git_empty create mode 100644 packages/libxslt/libxslt-1.1.17/destdir.patch create mode 100644 packages/libxslt/libxslt_1.1.17.bb diff --git a/packages/libxslt/libxslt-1.1.17/.mtn2git_empty b/packages/libxslt/libxslt-1.1.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libxslt/libxslt-1.1.17/destdir.patch b/packages/libxslt/libxslt-1.1.17/destdir.patch new file mode 100644 index 0000000000..8df1b206bc --- /dev/null +++ b/packages/libxslt/libxslt-1.1.17/destdir.patch @@ -0,0 +1,10 @@ +Index: libxslt-1.1.17/libxslt/Makefile.am +=================================================================== +--- libxslt-1.1.17.orig/libxslt/Makefile.am 2005-10-02 11:25:21.000000000 +0200 ++++ libxslt-1.1.17/libxslt/Makefile.am 2006-09-29 23:13:35.000000000 +0200 +@@ -61,4 +61,4 @@ + @(cd ../xsltproc ; $(MAKE)) + + install-exec-hook: +- $(mkinstalldirs) "$(libdir)/libxslt-plugins" ++ $(mkinstalldirs) "$(DESTDIR)$(libdir)/libxslt-plugins" diff --git a/packages/libxslt/libxslt_1.1.17.bb b/packages/libxslt/libxslt_1.1.17.bb new file mode 100644 index 0000000000..816b3fdd04 --- /dev/null +++ b/packages/libxslt/libxslt_1.1.17.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "GNOME XSLT library" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "libxml2" +LICENSE = "MIT" +PR = "r2" + +SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz" +S = "${WORKDIR}/libxslt-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" + +xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \ + keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \ + templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \ + xsltexports.h xsltutils.h" +exsltheaders = "exslt.h exsltconfig.h exsltexports.h" + +do_stage () { + oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR} + oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR} + + mkdir -p ${STAGING_INCDIR}/libxslt + for i in ${xsltheaders}; do + install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i + done + mkdir -p ${STAGING_INCDIR}/libexslt + for i in ${exsltheaders}; do + install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i + done + + cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \ + -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \ + -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \ + -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config + chmod a+rx ${STAGING_BINDIR}/xslt-config + install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/ +} + +PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" + +FILES_${PN}-dev += "${bindir}/xslt-config" +FILES_${PN}-utils += "${bindir}" -- cgit v1.2.3