diff options
34 files changed, 649 insertions, 136 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 504707e37b..a08ba97fde 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1,5 +1,15 @@ BB_DEFAULT_TASK = "build" +# like os.path.join but doesn't treat absolute RHS specially +def base_path_join(a, *p): + path = a + for b in p: + if path == '' or path.endswith('/'): + path += b + else: + path += '/' + b + return path + def base_dep_prepend(d): import bb; # diff --git a/packages/dropbear/dropbear-0.49/.mtn2git_empty b/packages/dropbear/dropbear-0.49/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dropbear/dropbear-0.49/.mtn2git_empty diff --git a/packages/dropbear/dropbear-0.49/configure.patch b/packages/dropbear/dropbear-0.49/configure.patch new file mode 100644 index 0000000000..8d11b23f14 --- /dev/null +++ b/packages/dropbear/dropbear-0.49/configure.patch @@ -0,0 +1,27 @@ +Index: dropbear-0.49/configure.in +=================================================================== +--- dropbear-0.49.orig/configure.in ++++ dropbear-0.49/configure.in +@@ -164,14 +164,20 @@ AC_ARG_ENABLE(openpty, + AC_MSG_NOTICE(Not using openpty) + else + AC_MSG_NOTICE(Using openpty if available) +- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY,,Have openpty() function)]) ++ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) + fi + ], + [ + AC_MSG_NOTICE(Using openpty if available) +- AC_SEARCH_LIBS(openpty, util, [AC_DEFINE(HAVE_OPENPTY)]) ++ AC_SEARCH_LIBS(openpty, util, [dropbear_cv_func_have_openpty=yes]) + ] + ) ++ ++if test "x$dropbear_cv_func_have_openpty" = "xyes"; then ++ AC_DEFINE(HAVE_OPENPTY,,Have openpty() function) ++ no_ptc_check=yes ++ no_ptmx_check=yes ++fi + + + AC_ARG_ENABLE(syslog, diff --git a/packages/dropbear/dropbear_0.49.bb b/packages/dropbear/dropbear_0.49.bb new file mode 100644 index 0000000000..f98c0ac8f6 --- /dev/null +++ b/packages/dropbear/dropbear_0.49.bb @@ -0,0 +1 @@ +require dropbear.inc diff --git a/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb index 8d1d580c90..dcb5c412d0 100644 --- a/packages/e2fsprogs/e2fsprogs-native_1.38.bb +++ b/packages/e2fsprogs/e2fsprogs-native_1.38.bb @@ -1,20 +1,13 @@ SECTION = "base" -require e2fsprogs_${PV}.bb +require e2fsprogs.inc inherit native +EXTRA_OECONF = "" + FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PACKAGES = "" DEPENDS = "" do_stage () { - oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/e2p - for h in ${e2pheaders}; do - install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" - done - install -d ${STAGING_INCDIR}/ext2fs - for h in ${ext2fsheaders}; do - install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" - done + oe_runmake install } diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc index cd8014a759..f209baf3b4 100644 --- a/packages/e2fsprogs/e2fsprogs.inc +++ b/packages/e2fsprogs/e2fsprogs.inc @@ -5,8 +5,10 @@ SECTION = "base" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" -inherit autotools pkgconfig +S = "${WORKDIR}/e2fsprogs-${PV}" -EXTRA_OECONF = " --enable-dynamic-e2fsck" +inherit autotools +EXTRA_OECONF = " --enable-dynamic-e2fsck" +PARALLEL_MAKE = "" diff --git a/packages/e2fsprogs/e2fsprogs_1.33.bb b/packages/e2fsprogs/e2fsprogs_1.33.bb deleted file mode 100644 index 80572a0d41..0000000000 --- a/packages/e2fsprogs/e2fsprogs_1.33.bb +++ /dev/null @@ -1,37 +0,0 @@ -require e2fsprogs.inc - -PR = "r1" - -SRC_URI += "file://ln.patch;patch=1 \ - file://configure.patch;patch=1 \ - file://compile-subst.patch;patch=1 \ - file://m4.patch;patch=1" - -sbindir = "/sbin" - -PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck " -FILES_e2fsprogs-fsck = "${sbindir}/fsck" -FILES_e2fsprogs-e2fsck = "${sbindir}/e2fsck ${sbindir}/fsck.ext2 ${sbindir}/fsck.ext3" -FILES_e2fsprogs-mke2fs = "${sbindir}/mke2fs ${sbindir}/mkfs.ext2 ${sbindir}/mkfs.ext3" - -do_compile_prepend () { - find ./ -print|xargs chmod u=rwX - ( cd util; ${BUILD_CC} subst.c -o subst ) -} - -ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \ - ext2_types.h ext2_fs.h ext2_io.h \ - ext2fs.h" -e2pheaders = "e2p.h" -do_stage () { - oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/e2p - for h in ${e2pheaders}; do - install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" - done - install -d ${STAGING_INCDIR}/ext2fs - for h in ${ext2fsheaders}; do - install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" - done -} diff --git a/packages/e2fsprogs/e2fsprogs_1.34.bb b/packages/e2fsprogs/e2fsprogs_1.34.bb deleted file mode 100644 index 837cf962a0..0000000000 --- a/packages/e2fsprogs/e2fsprogs_1.34.bb +++ /dev/null @@ -1,38 +0,0 @@ -require e2fsprogs.inc - -PR = "r1" - -SRC_URI += "file://ln.patch;patch=1 \ - file://configure.patch;patch=1 \ - file://compile-subst.patch;patch=1 \ - file://m4.patch;patch=1 \ - file://ldflags.patch;patch=1" - -sbindir = "/sbin" - -PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck " -FILES_e2fsprogs-fsck = "${sbindir}/fsck" -FILES_e2fsprogs-e2fsck = "${sbindir}/e2fsck ${sbindir}/fsck.ext2 ${sbindir}/fsck.ext3" -FILES_e2fsprogs-mke2fs = "${sbindir}/mke2fs ${sbindir}/mkfs.ext2 ${sbindir}/mkfs.ext3" - -do_compile_prepend () { - find ./ -print|xargs chmod u=rwX - ( cd util; ${BUILD_CC} subst.c -o subst ) -} - -ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \ - ext2_types.h ext2_fs.h ext2_io.h \ - ext2fs.h" -e2pheaders = "e2p.h" -do_stage () { - oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/e2p - for h in ${e2pheaders}; do - install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" - done - install -d ${STAGING_INCDIR}/ext2fs - for h in ${ext2fsheaders}; do - install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" - done -} diff --git a/packages/e2fsprogs/e2fsprogs_1.35.bb b/packages/e2fsprogs/e2fsprogs_1.35.bb deleted file mode 100644 index 837cf962a0..0000000000 --- a/packages/e2fsprogs/e2fsprogs_1.35.bb +++ /dev/null @@ -1,38 +0,0 @@ -require e2fsprogs.inc - -PR = "r1" - -SRC_URI += "file://ln.patch;patch=1 \ - file://configure.patch;patch=1 \ - file://compile-subst.patch;patch=1 \ - file://m4.patch;patch=1 \ - file://ldflags.patch;patch=1" - -sbindir = "/sbin" - -PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck " -FILES_e2fsprogs-fsck = "${sbindir}/fsck" -FILES_e2fsprogs-e2fsck = "${sbindir}/e2fsck ${sbindir}/fsck.ext2 ${sbindir}/fsck.ext3" -FILES_e2fsprogs-mke2fs = "${sbindir}/mke2fs ${sbindir}/mkfs.ext2 ${sbindir}/mkfs.ext3" - -do_compile_prepend () { - find ./ -print|xargs chmod u=rwX - ( cd util; ${BUILD_CC} subst.c -o subst ) -} - -ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \ - ext2_types.h ext2_fs.h ext2_io.h \ - ext2fs.h" -e2pheaders = "e2p.h" -do_stage () { - oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ - oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/e2p - for h in ${e2pheaders}; do - install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" - done - install -d ${STAGING_INCDIR}/ext2fs - for h in ${ext2fsheaders}; do - install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" - done -} diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb index 32e5f7b534..2e8bf3d219 100644 --- a/packages/e2fsprogs/e2fsprogs_1.38.bb +++ b/packages/e2fsprogs/e2fsprogs_1.38.bb @@ -3,9 +3,6 @@ require e2fsprogs.inc PR = "r8" SRC_URI += "file://no-hardlinks.patch;patch=1" -S = "${WORKDIR}/e2fsprogs-${PV}" - -PARALLEL_MAKE = "" EXTRA_OECONF += " --sbindir=${base_sbindir}" diff --git a/packages/libxml/libxml2-native_2.6.26.bb b/packages/libxml/libxml2-native_2.6.26.bb index 74ddfeb33a..97ae5c47ec 100644 --- a/packages/libxml/libxml2-native_2.6.26.bb +++ b/packages/libxml/libxml2-native_2.6.26.bb @@ -1,4 +1,5 @@ DESCRIPTION = "GNOME XML library" +PR = "r1" SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz \ file://no-testapi.patch;patch=1" @@ -10,7 +11,7 @@ S = "${WORKDIR}/libxml2-${PV}" inherit autotools native pkgconfig -EXTRA_OECONF = "--with-python=${STAGING_INCDIR}/python2.4 --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --without-c14n" +EXTRA_OECONF = "--with-python=${STAGING_INCDIR}/python2.4 --without-debug --without-legacy --without-schemas --without-catalog --without-docbook --with-c14n" headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h" diff --git a/packages/libxml/libxml2_2.6.26.bb b/packages/libxml/libxml2_2.6.26.bb index ecc4191fd9..9f5295bdb2 100644 --- a/packages/libxml/libxml2_2.6.26.bb +++ b/packages/libxml/libxml2_2.6.26.bb @@ -2,13 +2,13 @@ DESCRIPTION = "GNOME XML Parser library" SECTION = "libs" PRIORITY = "optional" LICENSE = "MIT" -PR = "r1" +PR = "r2" SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz" inherit autotools pkgconfig binconfig -EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n" +EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n" export LDFLAGS += "-ldl" diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 57d3028742..b16c3d481d 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -364,4 +364,4 @@ do_deploy() { deploy_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3' } -addtask deploy before do_build after do_compile +addtask deploy before do_package after do_install diff --git a/packages/logrotate/.mtn2git_empty b/packages/logrotate/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/logrotate/.mtn2git_empty diff --git a/packages/logrotate/files/.mtn2git_empty b/packages/logrotate/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/logrotate/files/.mtn2git_empty diff --git a/packages/logrotate/files/logrotate-3.7.1.patch b/packages/logrotate/files/logrotate-3.7.1.patch new file mode 100644 index 0000000000..e184977ece --- /dev/null +++ b/packages/logrotate/files/logrotate-3.7.1.patch @@ -0,0 +1,20 @@ +--- logrotate-3.7.1.old/Makefile 2007-02-17 17:41:04.000000000 +1100 ++++ logrotate-3.7.1/Makefile 2007-02-17 17:40:38.000000000 +1100 +@@ -3,7 +3,7 @@ + CVSTAG = r$(subst .,-,$(VERSION)) + OS_NAME = $(shell uname -s) + LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`) +-CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS) ++CFLAGS += -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS) + PROG = logrotate + MAN = logrotate.8 + LOADLIBES = -lpopt +@@ -69,7 +69,7 @@ + + ifeq ($(RPM_OPT_FLAGS),) + CFLAGS += -g +-LDFLAGS = -g ++LDFLAGS += -g + endif + + ifeq (.depend,$(wildcard .depend)) diff --git a/packages/logrotate/files/logrotate.conf b/packages/logrotate/files/logrotate.conf new file mode 100644 index 0000000000..b370b392e7 --- /dev/null +++ b/packages/logrotate/files/logrotate.conf @@ -0,0 +1,30 @@ +# see "man logrotate" for details +# rotate log files weekly +weekly + +# keep 4 weeks worth of backlogs +rotate 4 + +# create new (empty) log files after rotating old ones +create + +# uncomment this if you want your log files compressed +#compress + +# ipk packages should drop log rotation information into this directory +include /etc/logrotate.d + +# no packages own wtmp -- we'll rotate them here +/var/log/wtmp { + monthly + create 0664 root root + rotate 1 +} + +# /var/log/messages { +# rotate 5 +# postrotate +# /bin/killall syslogd +# /bin/killall klogd +# endscript +# } diff --git a/packages/logrotate/logrotate_3.7.1.bb b/packages/logrotate/logrotate_3.7.1.bb new file mode 100644 index 0000000000..2697607cfd --- /dev/null +++ b/packages/logrotate/logrotate_3.7.1.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Rotates, compresses, removes and mails system log files" +HOMEPAGE = "http://packages.debian.org/unstable/admin/logrotate" +RCONFLICTS = "logrotate-script" +RRECOMMENDS = "gzip" +DEPENDS = "popt" +RDEPENDS = "cron" +SECTION = "admin" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://ftp.debian.org/debian/pool/main/l/logrotate/logrotate_${PV}.orig.tar.gz \ + file://logrotate-3.7.1.patch;patch=1 \ + file://logrotate.conf" + +CFLAGS_prepend += "-I${STAGING_INCDIR} " +LDFLAGS_prepend += "-L${STAGING_LIBDIR} " +EXTRA_OEMAKE = "-p" + +do_compile() { + oe_runmake +} + +do_install () { + # Install the binary and conf file + install -D -s -m 0755 ${WORKDIR}/logrotate-${PV}/logrotate ${D}${base_sbindir}/logrotate + install -D -m 0644 ${WORKDIR}/logrotate.conf ${D}${sysconfdir}/logrotate.conf + install -m 0755 -d ${D}${sysconfdir}/logrotate.d +} + +pkg_postinst () { + # Add the logrotate line to /etc/crontab + grep -q "/sbin/logrotate" ${sysconfdir}/crontab || echo "*/5 * * * * /sbin/logrotate /etc/logrotate.conf" >> ${sysconfdir}/crontab +} + +pkg_postrm() { + # Remove the logrotate line from /etc/crontab + grep -v /sbin/logrotate ${sysconfdir}/crontab > ${sysconfdir}/crontab.no-${PF} + mv ${sysconfdir}/crontab.no-${PF} ${sysconfdir}/crontab +} diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index ecb296324c..76c949c0dd 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -96,6 +96,7 @@ SLUGOS_PACKAGES = "\ libvorbis \ libxml2 \ litestream \ + logrotate \ lrzsz \ lsof \ lvm2 \ @@ -124,6 +125,7 @@ SLUGOS_PACKAGES = "\ netcat \ nmap \ ntp \ + ntpclient \ obexftp \ obexpush \ openobex-apps \ diff --git a/packages/ntpclient/.mtn2git_empty b/packages/ntpclient/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ntpclient/.mtn2git_empty diff --git a/packages/ntpclient/files/.mtn2git_empty b/packages/ntpclient/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ntpclient/files/.mtn2git_empty diff --git a/packages/ntpclient/files/init b/packages/ntpclient/files/init new file mode 100644 index 0000000000..7b859026cd --- /dev/null +++ b/packages/ntpclient/files/init @@ -0,0 +1,42 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/ntpclient and type +# > update-rc.d ntpclient defaults 60 +# +ntpclient=/sbin/ntpclient +test -x "$ntpclient" || exit 0 +# Seconds Between Time Checks +ntpinterval=600 +# Upstream NTP Server Name +ntpserver=pool.ntp.org + +case "$1" in + start) + echo -n "Starting NTP Client" + start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/ntpclient.pid --exec $ntpclient -- -l -i $ntpinterval -h $ntpserver + echo "." + ;; + stop) + echo -n "Stopping NTP Client" + start-stop-daemon --stop --quiet --pidfile /var/run/ntpclient.pid + echo "." + ;; + reload|force-reload) + start-stop-daemon --stop --quiet --signal 1 --exec $ntpclient + ;; + restart) + echo -n "Stopping NTP Client" + start-stop-daemon --stop --quiet --pidfile /var/run/ntpclient.pid + echo "." + sleep 1 + echo -n "Starting NTP Client" + start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/ntpclient.pid --exec $ntpclient -- -l -i $ntpinterval -h $ntpserver + echo "." + ;; + *) + echo "Usage: /etc/init.d/ntpclient {start|stop|reload|restart|force-reload}" + exit 1 +esac + +exit 0 diff --git a/packages/ntpclient/ntpclient_2003_194.bb b/packages/ntpclient/ntpclient_2003_194.bb new file mode 100644 index 0000000000..e2f58631bd --- /dev/null +++ b/packages/ntpclient/ntpclient_2003_194.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "NTP (RFC-1305) client for unix-alike computers" +HOMEPAGE = "http://doolittle.icarus.com/ntpclient" +AUTHOR = "Larry Doolittle <larry@doolittle.boa.org>" +RDEPENDS = "busybox" +SECTION = "admin" +LICENSE = "GPL/v2" +PR = "r0" +# The ntpclient package uses version numbers that include an underscore :( +PV = "2003_194" +# ntpclient unpacks into a directory that doesn't include version info :( +S = "${WORKDIR}/${PN}" + +SRC_URI = "http://doolittle.icarus.com/ntpclient/ntpclient_${PV}.tar.gz \ + file://init" + +INITSCRIPT_NAME = "ntpclient" +INITSCRIPT_PARAMS = "defaults 65" +inherit update-rc.d + +do_compile() { + oe_runmake ntpclient + oe_runmake adjtimex +} + +do_install () { + # Install the binary and tools + install -D -s -m 0755 ${S}/ntpclient ${D}${base_sbindir}/ntpclient + install -D -s -m 0755 ${S}/adjtimex ${D}${base_sbindir}/adjtimex + install -D -m 0755 ${S}/rate.awk ${D}${sbindir}/ntpclient-drift-rate.awk + install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ntpclient +} + diff --git a/packages/php/php-native_4.4.4.bb b/packages/php/php-native_4.4.4.bb new file mode 100644 index 0000000000..c90aa83c01 --- /dev/null +++ b/packages/php/php-native_4.4.4.bb @@ -0,0 +1,5 @@ +SECTION = "console/network" +require php_${PV}.bb +inherit native +FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" +DEPENDS = "zlib-native" diff --git a/packages/php/php-native_5.2.0.bb b/packages/php/php-native_5.2.0.bb new file mode 100644 index 0000000000..7f5bc9fd94 --- /dev/null +++ b/packages/php/php-native_5.2.0.bb @@ -0,0 +1,9 @@ +SECTION = "console/network" +require php_${PV}.bb +inherit autotools native pkgconfig +export LIBS=" -lxml2 " +export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" + +FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" +DEPENDS = "zlib-native libxml2-native" + diff --git a/packages/php/php_4.4.4.bb b/packages/php/php_4.4.4.bb new file mode 100644 index 0000000000..c15a9ee486 --- /dev/null +++ b/packages/php/php_4.4.4.bb @@ -0,0 +1 @@ +require php.inc diff --git a/packages/php/php_5.2.0.bb b/packages/php/php_5.2.0.bb new file mode 100644 index 0000000000..919d96f8e3 --- /dev/null +++ b/packages/php/php_5.2.0.bb @@ -0,0 +1,41 @@ +SECTION = "console/network" +DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." +LICENSE = "PHP" +DEPENDS = "zlib libxml2 mysql libiconv" +SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\ + file://autotools.patch;patch=1 \ + file://acinclude-xml2-config.patch;patch=1 \ + " +S = "${WORKDIR}/php-${PV}" +PR = "r0" + +inherit autotools + +export THREADS="pthread" +export LIBS=" -lpthread " + +CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" +EXTRA_OECONF = " --without-iconv \ + --enable-discard-path \ + --enable-sockets \ + --enable-memory-limit \ + --enable-wddx \ + --with-zlib" + +EXTRA_OECONF += " --without-pear --with-libxml-dir=${STAGING_BINDIR} " +export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" + +# Uncomment the following two lines, and comment the above to enable PEAR +#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/php" +#DEPENDS += " php-native" + +acpaths = "" + +do_configure_append() { + find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' +} + +do_install () { + oe_runmake 'INSTALL_ROOT=${D}' install +} + diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb index 9fdd3aa235..3e18374afa 100644 --- a/packages/pulseaudio/pulseaudio_0.9.5.bb +++ b/packages/pulseaudio/pulseaudio_0.9.5.bb @@ -10,7 +10,7 @@ DEPENDS += "alsa-lib" RPROVIDES = "esound esd" -PR = "r4" +PR = "r5" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz" @@ -30,10 +30,15 @@ EXTRA_OECONF = "\ PARALLEL_MAKE = "" +export TARGET_FPU="${TARGET_FPU}" do_install_append() { install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles.04_pulse ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse + + if [ "x${TARGET_FPU}" == "xsoft" ] ; then + sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf + fi } diff --git a/packages/uclibc/uclibc-0.9.28/i586/.mtn2git_empty b/packages/uclibc/uclibc-0.9.28/i586/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.28/i586/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.28/i586/uClibc.config b/packages/uclibc/uclibc-0.9.28/i586/uClibc.config new file mode 100644 index 0000000000..930e84521a --- /dev/null +++ b/packages/uclibc/uclibc-0.9.28/i586/uClibc.config @@ -0,0 +1,172 @@ +# +# Automatically generated make config: don't edit +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +TARGET_i386=y +# TARGET_i960 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +HAVE_ELF=y +ARCH_SUPPORTS_LITTLE_ENDIAN=y +TARGET_ARCH="i386" +# CONFIG_GENERIC_386 is not set +# CONFIG_386 is not set +# CONFIG_486 is not set +# CONFIG_586 is not set +# CONFIG_586MMX is not set +# CONFIG_686 is not set +# CONFIG_PENTIUMII is not set +CONFIG_PENTIUMIII=y +# CONFIG_PENTIUM4 is not set +# CONFIG_K6 is not set +# CONFIG_K7 is not set +# CONFIG_ELAN is not set +# CONFIG_CRUSOE is not set +# CONFIG_WINCHIPC6 is not set +# CONFIG_WINCHIP2 is not set +# CONFIG_CYRIXIII is not set +# CONFIG_NEHEMIAH is not set +ARCH_LITTLE_ENDIAN=y +# ARCH_BIG_ENDIAN is not set +# ARCH_HAS_NO_MMU is not set +ARCH_HAS_MMU=y +UCLIBC_HAS_FLOATS=y +HAS_FPU=y +DO_C99_MATH=y +KERNEL_SOURCE="/work/oplinux-0.2/tmp/uclibc/cross/i586-linux-uclibc" +C_SYMBOL_PREFIX="" +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# HAVE_NO_SHARED is not set +HAVE_SHARED=y +# ARCH_HAS_NO_LDSO is not set +BUILD_UCLIBC_LDSO=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +LDSO_RUNPATH=y +# DL_FINI_CRT_COMPAT is not set +UCLIBC_CTOR_DTOR=y +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +UCLIBC_HAS_LFS=y +# UCLIBC_STATIC_LDCONFIG is not set +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y +UCLIBC_DYNAMIC_ATEXIT=y +HAS_SHADOW=y +UNIX98PTY_ONLY=y +ASSUME_DEVPTS=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Networking Support +# +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +UCLIBC_HAS_FULL_RPC=y + +# +# String and Stdio Support +# +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +UCLIBC_HAS_STDIO_BUFSIZ_256=y +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +UCLIBC_HAS_PRINTF_M_SPEC=y +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SIGNUM_MESSAGES=y +# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_GNU_GETOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_GLOB=y + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="//usr" + +# +# uClibc security related options +# +# UCLIBC_SECURITY is not set + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +# DODEBUG is not set +# DODEBUG_PT is not set +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +WARNINGS="-Wall" +# UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc-cvs/i586/.mtn2git_empty b/packages/uclibc/uclibc-cvs/i586/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/i586/.mtn2git_empty diff --git a/packages/uclibc/uclibc-cvs/i586/uClibc.config b/packages/uclibc/uclibc-cvs/i586/uClibc.config new file mode 100644 index 0000000000..d1bf538902 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/i586/uClibc.config @@ -0,0 +1,197 @@ +# +# Automatically generated make config: don't edit +# Sat Feb 24 08:24:11 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +TARGET_i386=y +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="i386" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_GENERIC_386 is not set +# CONFIG_386 is not set +# CONFIG_486 is not set +# CONFIG_586 is not set +# CONFIG_586MMX is not set +# CONFIG_686 is not set +# CONFIG_PENTIUMII is not set +CONFIG_PENTIUMIII=y +# CONFIG_PENTIUM4 is not set +# CONFIG_K6 is not set +# CONFIG_K7 is not set +# CONFIG_ELAN is not set +# CONFIG_CRUSOE is not set +# CONFIG_WINCHIPC6 is not set +# CONFIG_WINCHIP2 is not set +# CONFIG_CYRIXIII is not set +# CONFIG_NEHEMIAH is not set +ARCH_LITTLE_ENDIAN=y + +# +# Using Little Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_SOURCE="/work/oplinux-0.2/tmp/uclibc/cross/i586-linux-uclibc" +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# HAVE_NO_SHARED is not set +# ARCH_HAS_NO_LDSO is not set +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y +UCLIBC_CTOR_DTOR=y +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y +UCLIBC_HAS_LFS=y +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y +UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y +# UCLIBC_SUSV3_LEGACY is not set +UCLIBC_HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +UCLIBC_HAS___PROGNAME=y +UNIX98PTY_ONLY=y +ASSUME_DEVPTS=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Networking Support +# +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +UCLIBC_HAS_FULL_RPC=y +# UCLIBC_HAS_REENTRANT_RPC is not set +# UCLIBC_USE_NETLINK is not set + +# +# String and Stdio Support +# +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +UCLIBC_HAS_STDIO_BUFSIZ_256=y +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +UCLIBC_HAS_PRINTF_M_SPEC=y +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SIGNUM_MESSAGES=y +# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_GNU_GETOPT=y +UCLIBC_HAS_GNU_GETSUBOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_GLOB=y +# UCLIBC_HAS_GNU_GLOB is not set + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="//usr" + +# +# Security options +# +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +UCLIBC_BUILD_NOW=y +UCLIBC_BUILD_NOEXECSTACK=y + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +# DODEBUG is not set +# DODEBUG_PT is not set +DOSTRIP=y +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +# UCLIBC_MALLOC_DEBUGGING is not set +WARNINGS="-Wall" +# EXTRA_WARNINGS is not set +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb index 8fe97a7b1f..4cc39fcd07 100644 --- a/packages/uclibc/uclibc_0.9.28.bb +++ b/packages/uclibc/uclibc_0.9.28.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r8" +PR = "r9" require uclibc.inc diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 0a64761f38..86fab657bd 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.28" PV = "${UCLIBC_BASE}+svn${SRCDATE}" -PR = "r4" +PR = "r5" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. |