[oe-commits] org.oe.dev merge of '683035d547a30c5f79f681170ee31566e22d5ed6'
rwhitby commit
openembedded-commits at lists.openembedded.org
Sat Aug 18 13:29:16 UTC 2007
merge of '683035d547a30c5f79f681170ee31566e22d5ed6'
and '9ff0f129c558fe9930febe6662f830fa9069d3b4'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 02c31916f8203f8e8f2ded060c7f3756a95c9841
ViewMTN: http://monotone.openembedded.org/revision.psp?id=02c31916f8203f8e8f2ded060c7f3756a95c9841
Files:
1
packages/redboot-utils/fis_1.0.bb
packages/net-snmp/net-snmp-5.4.1
packages/clamav/clamav_0.91.1.bb
packages/net-snmp/net-snmp_5.4.1.bb
classes/sanity.bbclass
conf/machine/davinci-dvevm.conf
packages/clamsmtp/clamsmtp_1.8.bb
packages/havp/havp_0.86.bb
packages/iana-etc/iana-etc_2.20.bb
packages/netbase/netbase_4.21.bb
packages/p3scan/p3scan_2.9.05d.bb
packages/scummvm/scummvm.inc
Diffs:
#
# mt diff -r683035d547a30c5f79f681170ee31566e22d5ed6 -r02c31916f8203f8e8f2ded060c7f3756a95c9841
#
#
#
# patch "packages/redboot-utils/fis_1.0.bb"
# from [a66b4741b57f521582e2e3edd47cc42cebe7097d]
# to [423fde1a30e871e390b48542349b88efb3a07ac9]
#
============================================================
--- packages/redboot-utils/fis_1.0.bb a66b4741b57f521582e2e3edd47cc42cebe7097d
+++ packages/redboot-utils/fis_1.0.bb 423fde1a30e871e390b48542349b88efb3a07ac9
@@ -1,15 +1,14 @@ DESCRIPTION = "Tool to edit the Redboot
DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
-PR = "r3"
+PR = "r4"
-SRC_URI = "http://svn.chezphil.org/utils/trunk/fis.c"
+SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http"
+S="${WORKDIR}/trunk"
-do_compile() {
- ${CC} --std=c99 -Os -W -o fis ${WORKDIR}/fis.c
-}
+export CFLAGS += "--std=c99"
do_install() {
- ${STRIP} ${WORKDIR}/fis-${PV}/fis
+ ${STRIP} ${S}/fis
install -d ${D}/${sbindir}
- install -m 755 ${WORKDIR}/fis-${PV}/fis ${D}/${sbindir}
+ install -m 755 ${S}/fis ${D}/${sbindir}
}
#
# mt diff -r9ff0f129c558fe9930febe6662f830fa9069d3b4 -r02c31916f8203f8e8f2ded060c7f3756a95c9841
#
#
#
# add_dir "packages/net-snmp/net-snmp-5.4.1"
#
# add_file "packages/clamav/clamav_0.91.1.bb"
# content [7c3791a3534fbc04fac0dbd2e2bee620df48358f]
#
# add_file "packages/net-snmp/net-snmp_5.4.1.bb"
# content [ff7414ae272b8ed952c42949e3929a976ddff839]
#
# patch "classes/sanity.bbclass"
# from [994303fc1fb3b4f460621e0ee691d88588acaf70]
# to [808f5e34043a37c456f2b223aace94f414b22349]
#
# patch "conf/machine/davinci-dvevm.conf"
# from [e9f21b6a37024cda89bab889af2959652df27a9e]
# to [ad3f1d36c3ae769c5772533d8f1a3c8a48db13e4]
#
# patch "packages/clamsmtp/clamsmtp_1.8.bb"
# from [42f32e0aadc99b67383ae08e64c6e0f10d01fc20]
# to [04779b98e5b7d98deae388246ed78966062c2a04]
#
# patch "packages/havp/havp_0.86.bb"
# from [905e48c82366ed6ea1ebfa7d823f681af1bfe796]
# to [2b23274d5d114b2808ea2e7aa80d8bf51a223def]
#
# patch "packages/iana-etc/iana-etc_2.20.bb"
# from [1ac37d6f2237b8b3d2698cb9043b507d850169dc]
# to [ca8b60d989df53dad89e2c0b6a36c10d19c1cfab]
#
# patch "packages/netbase/netbase_4.21.bb"
# from [23eca4d14ac0f328bd75fa024d96b2514d2ff9a6]
# to [3fec27517cd3465754989f44477022d59bf7749a]
#
# patch "packages/p3scan/p3scan_2.9.05d.bb"
# from [d16800fce7f242b13af682bd3f5659d757ceb2a8]
# to [9368c7b776b2c76b34ee17ddc5cf39cdcd4f8bcf]
#
# patch "packages/scummvm/scummvm.inc"
# from [ce32e4b570cd9283a37a56668c0906cae153a009]
# to [881cbe05da932099a88bebbb6f1576dde96ad1d6]
#
============================================================
--- packages/clamav/clamav_0.91.1.bb 7c3791a3534fbc04fac0dbd2e2bee620df48358f
+++ packages/clamav/clamav_0.91.1.bb 7c3791a3534fbc04fac0dbd2e2bee620df48358f
@@ -0,0 +1,5 @@
+DEFAULT_PREFERENCE = "-1"
+
+require clamav.inc
+
+PR = "r0"
============================================================
--- packages/net-snmp/net-snmp_5.4.1.bb ff7414ae272b8ed952c42949e3929a976ddff839
+++ packages/net-snmp/net-snmp_5.4.1.bb ff7414ae272b8ed952c42949e3929a976ddff839
@@ -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 = ""
============================================================
--- classes/sanity.bbclass 994303fc1fb3b4f460621e0ee691d88588acaf70
+++ classes/sanity.bbclass 808f5e34043a37c456f2b223aace94f414b22349
@@ -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)
============================================================
--- conf/machine/davinci-dvevm.conf e9f21b6a37024cda89bab889af2959652df27a9e
+++ conf/machine/davinci-dvevm.conf ad3f1d36c3ae769c5772533d8f1a3c8a48db13e4
@@ -12,7 +12,7 @@ PREFERRED_VERSION_u-boot = "git"
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"
============================================================
--- packages/clamsmtp/clamsmtp_1.8.bb 42f32e0aadc99b67383ae08e64c6e0f10d01fc20
+++ packages/clamsmtp/clamsmtp_1.8.bb 04779b98e5b7d98deae388246ed78966062c2a04
@@ -8,7 +8,7 @@ RDEPENDS_${PN} = "clamav-daemon"
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 \
============================================================
--- packages/havp/havp_0.86.bb 905e48c82366ed6ea1ebfa7d823f681af1bfe796
+++ packages/havp/havp_0.86.bb 2b23274d5d114b2808ea2e7aa80d8bf51a223def
@@ -1,5 +1,5 @@ require havp.inc
require havp.inc
-PR = "r0"
+PR = "r1"
SRC_URI_append += " file://reconfigure.patch;patch=1"
============================================================
--- packages/iana-etc/iana-etc_2.20.bb 1ac37d6f2237b8b3d2698cb9043b507d850169dc
+++ packages/iana-etc/iana-etc_2.20.bb ca8b60d989df53dad89e2c0b6a36c10d19c1cfab
@@ -1,15 +1,18 @@ LICENSE = "OPL"
DESCRIPTION = "The iana-etc package provides the Unix/Linux /etc/services and /etc/protocols files."
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
}
============================================================
--- packages/netbase/netbase_4.21.bb 23eca4d14ac0f328bd75fa024d96b2514d2ff9a6
+++ packages/netbase/netbase_4.21.bb 3fec27517cd3465754989f44477022d59bf7749a
@@ -1,8 +1,8 @@ LICENSE = "GPL"
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 ${sysconfdir}/rpc \
+ ${sysconfdir}/protocols ${sysconfdir}/services"
-CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
============================================================
--- packages/p3scan/p3scan_2.9.05d.bb d16800fce7f242b13af682bd3f5659d757ceb2a8
+++ packages/p3scan/p3scan_2.9.05d.bb 9368c7b776b2c76b34ee17ddc5cf39cdcd4f8bcf
@@ -6,7 +6,7 @@ RDEPENDS_${PN} = "${PN}-templates-en"
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 \
============================================================
--- packages/scummvm/scummvm.inc ce32e4b570cd9283a37a56668c0906cae153a009
+++ packages/scummvm/scummvm.inc 881cbe05da932099a88bebbb6f1576dde96ad1d6
@@ -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
-}
-
More information about the Openembedded-commits
mailing list