diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/bwmon/bwmon_1.3.bb | 14 | ||||
-rw-r--r-- | packages/e17/e-utils_20060501.bb | 2 | ||||
-rw-r--r-- | packages/eventlog/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/eventlog/eventlog_0.2.5.bb | 9 | ||||
-rw-r--r-- | packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch | 21 | ||||
-rw-r--r-- | packages/gnupg/gnupg.inc | 4 | ||||
-rw-r--r-- | packages/gnupg/gnupg_1.4.2.2.bb | 5 | ||||
-rw-r--r-- | packages/libdvb/libdvb_0.5.5.1.bb | 20 | ||||
-rw-r--r-- | packages/libgpg-error/libgpg-error_1.3.bb | 4 | ||||
-rw-r--r-- | packages/libol/libol_0.3.18.bb | 16 | ||||
-rw-r--r-- | packages/libpcre/libpcre-native_4.4.bb | 2 | ||||
-rw-r--r-- | packages/libpcre/libpcre_4.4.bb | 40 | ||||
-rw-r--r-- | packages/libpng/libpng_1.2.12.bb | 29 | ||||
-rw-r--r-- | packages/meta/nylon-feed.bb | 1 | ||||
-rw-r--r-- | packages/nylon/simple-firewall.bb | 3 | ||||
-rw-r--r-- | packages/syslog-ng/syslog-ng_1.6.11.bb | 35 | ||||
-rw-r--r-- | packages/uclibc/uclibc.inc | 2 | ||||
-rw-r--r-- | packages/uclibc/uclibc_svn.bb | 20 | ||||
-rw-r--r-- | packages/zd1211/zd1211_r83.bb | 14 |
19 files changed, 139 insertions, 102 deletions
diff --git a/packages/bwmon/bwmon_1.3.bb b/packages/bwmon/bwmon_1.3.bb index 81cc0949a9..8f5d5f4e3b 100644 --- a/packages/bwmon/bwmon_1.3.bb +++ b/packages/bwmon/bwmon_1.3.bb @@ -1,17 +1,17 @@ DESCRIPTION = "The Linux bandwidth monitor" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" +LICENSE = "GPL" DEPENDS = "ncurses" -LICENSE = "Unspecified" - -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/bwmon/${P}.tar.gz \ - file://makefile.patch;patch=1" -EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}" + file://makefile.patch;patch=1" inherit autotools +EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}" + do_install () { - install -d ${D}${bindir} - install ${S}/bwmon ${D}${bindir}/bwmon + install -d ${D}${bindir} + install ${S}/bwmon ${D}${bindir}/bwmon } diff --git a/packages/e17/e-utils_20060501.bb b/packages/e17/e-utils_20060501.bb index 3f1af895ae..fc94cd106f 100644 --- a/packages/e17/e-utils_20060501.bb +++ b/packages/e17/e-utils_20060501.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Enlightenment Window Manager Utilities" -DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 e epsilon" +DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 epsilon" LICENSE = "MIT" PR = "r1" diff --git a/packages/eventlog/.mtn2git_empty b/packages/eventlog/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/eventlog/.mtn2git_empty diff --git a/packages/eventlog/eventlog_0.2.5.bb b/packages/eventlog/eventlog_0.2.5.bb new file mode 100644 index 0000000000..bf8beef391 --- /dev/null +++ b/packages/eventlog/eventlog_0.2.5.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Replacement syslog API" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "http://www.balabit.com/downloads/syslog-ng/2.0/src/${PN}-${PV}.tar.gz" + +inherit autotools + diff --git a/packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch b/packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch new file mode 100644 index 0000000000..914f1475b7 --- /dev/null +++ b/packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch @@ -0,0 +1,21 @@ +Originally the test for _'s on symbols was not done when cross-compiling and +it was assumed that the _'s were appended. The test does in fact work since +it simply compiles a file and then run's nm on it. So patch this to enable. +Without this x86 targets fail during linking since the assembler code has +the _'s appended when it shouldn't. + +--- gnupg-1.4.2.2/acinclude.m4 2006/09/11 22:11:23 1.1 ++++ gnupg-1.4.2.2/acinclude.m4 2006/09/11 22:17:25 +@@ -673,11 +673,7 @@ + ac_cv_sys_symbol_underscore=yes + ;; + *) +- if test "$cross_compiling" = yes; then +- ac_cv_sys_symbol_underscore=yes +- else +- tmp_do_check="yes" +- fi ++ tmp_do_check="yes" + ;; + esac + diff --git a/packages/gnupg/gnupg.inc b/packages/gnupg/gnupg.inc index b4eb9bba65..2d8e37605f 100644 --- a/packages/gnupg/gnupg.inc +++ b/packages/gnupg/gnupg.inc @@ -70,3 +70,7 @@ do_install () { mv ${D}${datadir}/${PN}/* ${D}/${docdir}/${PN}/ || : mv ${D}${prefix}/doc/* ${D}/${docdir}/${PN}/ || : } + +# Exclude debug files from the main packages +FILES_${PN} = "${bindir}/* ${datadir}/${PN} ${libexecdir}/${PN}/*" +FILES_${PN}-dbg += "${libexecdir}/${PN}/.debug" diff --git a/packages/gnupg/gnupg_1.4.2.2.bb b/packages/gnupg/gnupg_1.4.2.2.bb index 97c301cf97..b21eb88b91 100644 --- a/packages/gnupg/gnupg_1.4.2.2.bb +++ b/packages/gnupg/gnupg_1.4.2.2.bb @@ -6,8 +6,9 @@ EXTRA_OECONF += "--with-readline=${STAGING_LIBDIR}/.." SRC_URI += "file://15_free_caps.patch;patch=1 \ file://16_min_privileges.patch;patch=1 \ - file://22_zero_length_mpi_fix.patch;patch=1 " + file://22_zero_length_mpi_fix.patch;patch=1 \ + file://30_nm_always_check.patch;patch=1" S = "${WORKDIR}/gnupg-${PV}" -PR = "r1" +PR = "r2" diff --git a/packages/libdvb/libdvb_0.5.5.1.bb b/packages/libdvb/libdvb_0.5.5.1.bb index 0e0c2b9caf..2f5e77034d 100644 --- a/packages/libdvb/libdvb_0.5.5.1.bb +++ b/packages/libdvb/libdvb_0.5.5.1.bb @@ -1,29 +1,27 @@ -LICENSE = "GPL" DESCRIPTION = "Linux Digital Video Broadcast library" DESCRIPTION_libdvb-dev = "Headers for libdvb development" HOMEPAGE = "http://www.metzlerbros.org/dvb/index.html" -MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" SECTION = "libs" PRIORITY = "optional" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" +LICENSE = "GPL" PR = "r2" SRC_URI = "http://www.metzlerbros.org/dvb/${PN}-${PV}.tar.gz \ - file://topf2ps.patch;patch=1" + file://topf2ps.patch;patch=1" S = "${WORKDIR}/${PN}-${PV}" inherit autotools pkgconfig do_configure() { - grep -v ^PREFIX ${S}/config.mk > ${S}/config.mk.new - echo "PREFIX=${prefix}" >> ${S}/config.mk.new - mv ${S}/config.mk.new ${S}/config.mk + grep -v ^PREFIX ${S}/config.mk > ${S}/config.mk.new + echo "PREFIX=${prefix}" >> ${S}/config.mk.new + mv ${S}/config.mk.new ${S}/config.mk } - do_stage() { - install -d ${STAGING_INCDIR}/dvb - install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/dvb - oe_libinstall -a -C libdvb libdvb ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/dvb + install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/dvb + oe_libinstall -a -C libdvb libdvb ${STAGING_LIBDIR} } - diff --git a/packages/libgpg-error/libgpg-error_1.3.bb b/packages/libgpg-error/libgpg-error_1.3.bb index c29053832b..a2a19b254c 100644 --- a/packages/libgpg-error/libgpg-error_1.3.bb +++ b/packages/libgpg-error/libgpg-error_1.3.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" DESCRIPTION = "GPG-Error library" SECTION = "libs" PRIORITY = "optional" @@ -9,7 +9,7 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ # move libgpg-error-config into -dev package FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" +FILES_${PN}-dev += "${bindir}/*" inherit autotools binconfig pkgconfig diff --git a/packages/libol/libol_0.3.18.bb b/packages/libol/libol_0.3.18.bb new file mode 100644 index 0000000000..3412acfc9a --- /dev/null +++ b/packages/libol/libol_0.3.18.bb @@ -0,0 +1,16 @@ +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" +PR = "r5" + +SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${PN}-${PV}.tar.gz" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit autotools + +do_stage() { + install -d ${STAGING_INCDIR}/libol + install -m 0755 ${S}/libol-config ${STAGING_BINDIR} + install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR} + ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0 + install ${S}/src/*.h ${STAGING_INCDIR}/libol/ +} diff --git a/packages/libpcre/libpcre-native_4.4.bb b/packages/libpcre/libpcre-native_4.4.bb index 7caddc321d..7be8ffd0ac 100644 --- a/packages/libpcre/libpcre-native_4.4.bb +++ b/packages/libpcre/libpcre-native_4.4.bb @@ -1,4 +1,4 @@ SECTION = "unknown" -include libpcre_${PV}.bb +require libpcre_${PV}.bb inherit native FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}" diff --git a/packages/libpcre/libpcre_4.4.bb b/packages/libpcre/libpcre_4.4.bb index f26b595894..941888577b 100644 --- a/packages/libpcre/libpcre_4.4.bb +++ b/packages/libpcre/libpcre_4.4.bb @@ -5,41 +5,37 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." SECTION = "devel" -PR = "r1" - +PR = "r6" +LICENSE = "BSD" SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2" S = "${WORKDIR}/pcre-${PV}" -PARALLEL_MAKE = "" - inherit autotools binconfig +PARALLEL_MAKE = "" + LEAD_SONAME = "libpcre.so" CFLAGS_append = " -D_REENTRANT" EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000" - do_compile () { - ${BUILD_CC} -DLINK_SIZE=2 -I${S}/include -c dftables.c - ${BUILD_CC} dftables.o -o dftables - oe_runmake + # stop libtool from trying to link with host libraries - fix from #33 + # this resolve build problem on amd64 - #1015 + sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool + + # The generation of dftables can lead to timestamp problems with ccache + # because the generated config.h seems newer. It is sufficient to ensure that the + # attempt to build dftables inside make will actually work (foo_FOR_BUILD is + # only used for this). + oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}" } do_stage () { - # Force all -L(dir) output to be prepended with the staging libdir to stop libtool - # from trying to link to host libraries. - sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/*libtool - - oe_libinstall -a -so libpcre ${STAGING_LIBDIR} - oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR} - install -m 0644 pcre.h ${STAGING_INCDIR}/ - install -m 0644 pcreposix.h ${STAGING_INCDIR}/ - - # pcreposix linked originally to the libpcre in it's working directory. That messed - # the .la file up. I fix this manually here: - sed -i 's:${S}:${STAGING_LIBDIR}:' ${STAGING_LIBDIR}/libpcreposix.la + oe_libinstall -a -so libpcre ${STAGING_LIBDIR} + oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR} + install -m 0644 pcre.h ${STAGING_INCDIR}/ + install -m 0644 pcreposix.h ${STAGING_INCDIR}/ } - FILES_${PN} = "${libdir}/lib*.so*" -FILES_${PN}-dev += "${bindir}" +FILES_${PN}-dev += "${bindir}/*" diff --git a/packages/libpng/libpng_1.2.12.bb b/packages/libpng/libpng_1.2.12.bb index 66b691b617..deff600a7a 100644 --- a/packages/libpng/libpng_1.2.12.bb +++ b/packages/libpng/libpng_1.2.12.bb @@ -4,7 +4,7 @@ LICENSE = "libpng" SECTION = "libs" PRIORITY = "required" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -PR = "r3" +PR = "r4" DEPENDS = "zlib" @@ -21,36 +21,13 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2" S = "${WORKDIR}/libpng-${PV}" -inherit pkgconfig binconfig pkgconfig - -EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}" -CFLAGS += "-DPNG_NO_ASSEMBLER_CODE" - -do_compile() { - sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//' - unset LDFLAGS - oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \ - 'ZLIBINC=${STAGING_INCDIR}' \ - 'ZLIBLIB=${STAGING_LIBDIR}' -} - -# apperently libpng doesn't expand the vars in libpng.pc, so we'll do that with sed -# pkgconfig.bbclass will use a similar trick to fix them - -do_stage_prepend() { - sed -i -e 's:=@libdir@:=${libdir}:;' \ - -e 's:=@includedir@:=${includedir}:;' \ - -e 's:=@prefix@:=${prefix}:' \ - -e 's:=@exec_prefix@:=${exec_prefix}:' \ - -e 's:-lpng12:-lpng12\ -lz\ -lm:' \ - libpng.pc - -} +inherit autotools binconfig pkgconfig do_stage() { cp libpng.pc libpng12.pc install -m 644 png.h ${STAGING_INCDIR}/png.h install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h + oe_libinstall -so libpng ${STAGING_LIBDIR}/ oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so } diff --git a/packages/meta/nylon-feed.bb b/packages/meta/nylon-feed.bb index 21d53b9895..724e373739 100644 --- a/packages/meta/nylon-feed.bb +++ b/packages/meta/nylon-feed.bb @@ -9,7 +9,6 @@ DEPENDS = "${NYLON_FEED} \ glib-2.0 \ glibc \ gmp \ - hotplug \ iproute2 \ libcgicc \ libedit \ diff --git a/packages/nylon/simple-firewall.bb b/packages/nylon/simple-firewall.bb index 35911dad2c..408faf9f29 100644 --- a/packages/nylon/simple-firewall.bb +++ b/packages/nylon/simple-firewall.bb @@ -5,7 +5,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" LICENSE = "GPL" DEPENDS = "virtual/kernel" SRCDATE = "20060810" -PV = "cvs${CVSDATE}" +PV = "cvs${SRCDATE}" INHIBIT_PACKAGE_STRIP = "1" @@ -14,5 +14,6 @@ SRC_URI = "http://meshcube.org/nylon/unstable/sources/${PN}_gruen.4g__${SRCDATE} S = "${WORKDIR}/${PN}" do_install() { + install -d -m 755 ${D} (cd ${S}; tar -c --exclude .svn -f - . ) | tar -C ${D} -xpf - } diff --git a/packages/syslog-ng/syslog-ng_1.6.11.bb b/packages/syslog-ng/syslog-ng_1.6.11.bb new file mode 100644 index 0000000000..0eea18d4e9 --- /dev/null +++ b/packages/syslog-ng/syslog-ng_1.6.11.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Alternative system logger daemon" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" +DEPENDS = "libol flex" +PR = "r0" + +SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \ + file://syslog-ng.conf \ + file://initscript" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit autotools update-rc.d + +EXTRA_OECONF = "--with-libol=${STAGING_BINDIR}/" + +do_install_append() { + install -d ${D}/${sysconfdir}/${PN} + install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}/syslog-ng.conf + install -d ${D}/${sysconfdir}/init.d + install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog-ng +} + +pkg_postinst() { + update-rc.d -f syslog remove +} + +pkg_postrm() { + update-rc.d syslog add 5 +} + +CONFFILES_${PN} = "${sysconfdir}/${PN}/syslog-ng.conf" + +INITSCRIPT_NAME = "syslog-ng" + +INITSCRIPT_PARAMS = "defaults 05" diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index 2064489ec6..8cd85d53d1 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -14,7 +14,7 @@ MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" python __anonymous () { import bb, re - uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) + uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None) if not uc_os: raise bb.parse.SkipPackage("incompatible with target %s" % bb.data.getVar('TARGET_OS', d, 1)) diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index a12b9b99c6..c2821eb585 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -34,24 +34,4 @@ S = "${WORKDIR}/uClibc" # have a 'good' set of kernel header files in the cross directory. #UCLIBC_PATCHES += "file://nokernelheadercheck.patch;patch=1" # -# Thumb support -UCLIBC_PATCHES += " file://thumb-defined-arm-or-thumb.patch;patch=1" -# -# Thumb interworking support -UCLIBC_PATCHES += " file://thumb-mov-pc-bx.patch;patch=1" -UCLIBC_PATCHES += " file://thumb-swi-r7.patch;patch=1" -UCLIBC_PATCHES += " file://thumb-sysnum-h.patch;patch=1" -UCLIBC_PATCHES += " file://thumb-asm-swi.patch;patch=1" -UCLIBC_PATCHES += " file://thumb-call-via-rx.patch;patch=1" -# -# This is a core change and is controversial, maybe even wrong -# on some architectures -THUMB_INTERWORK_RESOLVE_PATCH = "" -THUMB_INTERWORK_RESOLVE_PATCH_thumb-interwork = " file://thumb-resolve.patch;patch=1" -UCLIBC_PATCHES += " ${THUMB_INTERWORK_RESOLVE_PATCH}" - -# Set this for non-head patches (the above list should match the -# requirements of the SVN head). -UCLIBC_SVN_PATCHES ?= "${UCLIBC_PATCHES}" -SRC_URI += "${UCLIBC_SVN_PATCHES}" diff --git a/packages/zd1211/zd1211_r83.bb b/packages/zd1211/zd1211_r83.bb index 5f0c6a0d0a..2a560bada5 100644 --- a/packages/zd1211/zd1211_r83.bb +++ b/packages/zd1211/zd1211_r83.bb @@ -1,16 +1,16 @@ DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" -PRIORITY = "optional" +HOMEPAGE = "http://zd1211.ath.cx/" SECTION = "kernel/modules" +PRIORITY = "optional" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" LICENSE = "GPL" -PR = "r1" RDEPENDS = "wireless-tools" +PR = "r1" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile.patch;patch=1" - + file://makefile.patch;patch=1" SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile-unslung.patch;patch=1 \ + file://makefile-unslung.patch;patch=1 \ file://unslung-iwpriv-hack.patch;patch=1 \ file://unslung-writel-logging.patch;patch=1" @@ -25,10 +25,10 @@ do_compile () { 'KDIR=${STAGING_KERNEL_DIR}' \ 'KERNEL_VERSION=${KERNEL_VERSION}' \ 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' + 'LD=${KERNEL_LD}' } -do_install() { +do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net } |