diff options
-rw-r--r-- | classes/sanity.bbclass | 7 | ||||
-rw-r--r-- | conf/machine/davinci-dvevm.conf | 2 | ||||
-rw-r--r-- | packages/clamav/clamav_0.91.1.bb | 5 | ||||
-rw-r--r-- | packages/clamsmtp/clamsmtp_1.8.bb | 2 | ||||
-rw-r--r-- | packages/havp/havp_0.86.bb | 2 | ||||
-rw-r--r-- | packages/iana-etc/iana-etc_2.20.bb | 13 | ||||
-rw-r--r-- | packages/net-snmp/net-snmp-5.4.1/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/net-snmp/net-snmp_5.4.1.bb | 54 | ||||
-rw-r--r-- | packages/netbase/netbase_4.21.bb | 6 | ||||
-rw-r--r-- | packages/p3scan/p3scan_2.9.05d.bb | 2 | ||||
-rw-r--r-- | packages/scummvm/scummvm.inc | 10 |
11 files changed, 79 insertions, 24 deletions
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 33cdae33ac..479abce7fa 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -90,7 +90,7 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," - required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum stty" + required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum" for util in required_utilities.split(): if not check_app_exists( util, e.data ): @@ -109,11 +109,6 @@ def check_sanity(e): if not oes_bb_conf: messages = messages + 'You do not include OpenEmbeddeds version of conf/bitbake.conf\n' - # Check if the terminal has stty +tostop - if "tostop" in os.popen("stty").read(): - messages = messages + "You have tostop in your stty terminal setting. This will make BitBake hang when executing. Execute stty -tostop fix this.\n" - - if messages != "": raise_sanity_error(messages) diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf index 8deaa092e8..10b4450384 100644 --- a/conf/machine/davinci-dvevm.conf +++ b/conf/machine/davinci-dvevm.conf @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_u-boot = "git" -UBOOT_MACHINE = "davinci_dvevm" +UBOOT_MACHINE = "davinci_dvevm_config" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" diff --git a/packages/clamav/clamav_0.91.1.bb b/packages/clamav/clamav_0.91.1.bb new file mode 100644 index 0000000000..6b6b16897d --- /dev/null +++ b/packages/clamav/clamav_0.91.1.bb @@ -0,0 +1,5 @@ +DEFAULT_PREFERENCE = "-1" + +require clamav.inc + +PR = "r0" diff --git a/packages/clamsmtp/clamsmtp_1.8.bb b/packages/clamsmtp/clamsmtp_1.8.bb index 38103de033..984d203e36 100644 --- a/packages/clamsmtp/clamsmtp_1.8.bb +++ b/packages/clamsmtp/clamsmtp_1.8.bb @@ -8,7 +8,7 @@ SECTION = "network" LICENSE = "BSD" DEPENDS = "clamav" RDEPENDS_${PN} = "clamav-daemon" -PR = "r1" +PR = "r2" SRC_URI = "http://memberwebs.com/nielsen/software/clamsmtp/clamsmtp-${PV}.tar.gz \ file://update-config.patch;patch=1 \ diff --git a/packages/havp/havp_0.86.bb b/packages/havp/havp_0.86.bb index c5bb0636bb..c1e392e80f 100644 --- a/packages/havp/havp_0.86.bb +++ b/packages/havp/havp_0.86.bb @@ -1,5 +1,5 @@ require havp.inc -PR = "r0" +PR = "r1" SRC_URI_append += " file://reconfigure.patch;patch=1" diff --git a/packages/iana-etc/iana-etc_2.20.bb b/packages/iana-etc/iana-etc_2.20.bb index ccf0b8da8a..6d8c615877 100644 --- a/packages/iana-etc/iana-etc_2.20.bb +++ b/packages/iana-etc/iana-etc_2.20.bb @@ -3,13 +3,16 @@ AUTHOR = "Seth W. Klein" HOMEPAGE = "http://www.sethwklein.net/projects/iana-etc/" SECTION = "base" LICENSE = "OPL" +PR = "r1" SRC_URI = "http://www.sethwklein.net/projects/iana-etc/downloads/${P}.tar.bz2" -do_make(){ - oe_runmake 'STRIP=yes' -} +# Don't install as /etc/protocols and /etc/services since they are installed +# by net-base and are considered config files. Install this side by side so +# end-user can manaulyl copy them and/or take entries from them. See #2505. -do_install(){ - oe_runmake 'DESTDIR=${D}' install +do_install() { + install -d ${D}${sysconfdir} + install -m 644 protocols ${D}${sysconfdir}/protocols.iana + install -m 644 services ${D}${sysconfdir}/services.iana } diff --git a/packages/net-snmp/net-snmp-5.4.1/.mtn2git_empty b/packages/net-snmp/net-snmp-5.4.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/net-snmp/net-snmp-5.4.1/.mtn2git_empty diff --git a/packages/net-snmp/net-snmp_5.4.1.bb b/packages/net-snmp/net-snmp_5.4.1.bb new file mode 100644 index 0000000000..0fc36d3ff3 --- /dev/null +++ b/packages/net-snmp/net-snmp_5.4.1.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Various tools relating to the Simple Network Management Protocol" +HOMEPAGE = "http://www.net-snmp.org/" +LICENSE = "BSD" +DEPENDS = "openssl" +RDEPENDS_${PN}-server += "net-snmp-mibs" +RDEPENDS_${PN}-client += "net-snmp-mibs" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ + file://configure-tail.patch;patch=1 \ + file://init \ + file://snmpd.conf \ + file://snmptrapd.conf" + +inherit autotools update-rc.d + +EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults \ + --disable-embedded-perl --with-perl-modules=no" +EXTRA_OEMAKE = "INSTALL_PREFIX=${D}" + +do_configure() { + # Additional flag based on target endiness (see siteinfo.bbclass) + ENDIANESS="${@base_conditional('SITEINFO_ENDIANESS', 'le', '--with-endianness=little', '--with-endianness=big', d)}" + oenote Determined endianess as: $ENDIANESS + libtoolize --force + oe_runconf $ENDIANESS +} +do_install_append() { + install -d ${D}${sysconfdir}/snmp + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd + install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/ + install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/ +} + +PACKAGES = "net-snmp-dbg net-snmp-doc net-snmp-dev net-snmp-libs \ + net-snmp-mibs net-snmp-server net-snmp-client" + +FILES_${PN}-libs = "${libdir}/*" +FILES_${PN}-mibs = "${datadir}/snmp/mibs" +FILES_${PN}-server = "${sbindir}/* ${sysconfdir}" +FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/" +FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" + +CONFFILES_${PN}-server = "${sysconfdir}/snmp/snmpd.conf \ + ${sysconfdir}/snmp/snmptrapd.conf" + +INITSCRIPT_PACKAGES = "${PN}-server" +INITSCRIPT_NAME_${PN}-server = "snmpd" +INITSCRIPT_PARAMS_${PN}-server = "defaults" + +LEAD_SONAME = "libnetsnmp.so" + +PARALLEL_MAKE = "" diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 6775008ea5..f9be31845c 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r20" +PR = "r21" inherit update-rc.d @@ -54,4 +54,6 @@ do_install () { install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces } -CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces" +CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts \ + ${sysconfdir}/network/interfaces ${sysconfdir}/rpc \ + ${sysconfdir}/protocols ${sysconfdir}/services" diff --git a/packages/p3scan/p3scan_2.9.05d.bb b/packages/p3scan/p3scan_2.9.05d.bb index 38739341e6..e419e2e234 100644 --- a/packages/p3scan/p3scan_2.9.05d.bb +++ b/packages/p3scan/p3scan_2.9.05d.bb @@ -6,7 +6,7 @@ SECTION = "network" LICENSE = "GPLv2" DEPENDS = "gmp bzip2 zlib clamav openssl" RDEPENDS_${PN} = "${PN}-templates-en" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/p3scan/p3scan-2.9.05d.tar.gz \ file://libtool-fix.patch;patch=1 \ diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 28257fab4b..5362a2884f 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -11,18 +11,14 @@ EXTRA_OECONF = "--host=${HOST_SYS} \ --backend=sdl \ --with-sdl-prefix=${STAGING_BINDIR_NATIVE}/.. \ --disable-alsa \ + --prefix=${prefix} \ --with-ogg-prefix=${STAGING_LIBDIR}/.. \ --with-vorbis-prefix=${STAGING_LIBDIR}/.. \ --with-mpeg2-prefix=${STAGING_LIBDIR}/.. \ --with-mad-prefix=${STAGING_LIBDIR}/.. " +EXTRA_OEMAKE = "MANDIR=${mandir}" + do_configure() { ./configure ${EXTRA_OECONF} } - - -do_install() { - install -d ${D}${bindir} - install -m 0755 scummvm ${D}${bindir}/scummvm -} - |