| Submitter | Tom Rini |
|---|---|
| Date | March 2, 2011, 11:33 p.m. |
| Message ID | <1299108818-9224-1-git-send-email-tom_rini@mentor.com> |
| Download | mbox | patch |
| Permalink | /patch/1045/ |
| State | New, archived |
| Headers | show |
Comments
On (02/03/11 16:33), Tom Rini wrote: > avahi is currently an 'auto' thing so we should spell it out to > be clear, set to on. > > Signed-off-by: Tom Rini <tom_rini@mentor.com> Acked-by: Khem Raj <raj.khem@gmail.com> > --- > recipes/samba/samba-ads_3.2.15.bb | 2 +- > recipes/samba/samba-ads_3.3.9.bb | 2 +- > recipes/samba/samba-ads_3.5.6.bb | 2 +- > recipes/samba/samba-essential_3.0.20.bb | 2 +- > recipes/samba/samba.inc | 3 ++- > recipes/samba/samba_3.0.23c.bb | 2 +- > recipes/samba/samba_3.0.34.bb | 2 +- > recipes/samba/samba_3.2.15.bb | 2 +- > recipes/samba/samba_3.3.0.bb | 2 +- > recipes/samba/samba_3.3.9.bb | 2 +- > recipes/samba/samba_3.5.6.bb | 2 +- > 11 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/recipes/samba/samba-ads_3.2.15.bb b/recipes/samba/samba-ads_3.2.15.bb > index 002bed7..1579f2c 100644 > --- a/recipes/samba/samba-ads_3.2.15.bb > +++ b/recipes/samba/samba-ads_3.2.15.bb > @@ -2,7 +2,7 @@ require samba.inc > require samba-ads.inc > LICENSE = "GPLv3" > > -PR = "r2" > +PR = "r3" > SRC_URI += "file://config-lfs.patch \ > file://quota.patch;striplevel=0 \ > file://configure-3.2.8.patch \ > diff --git a/recipes/samba/samba-ads_3.3.9.bb b/recipes/samba/samba-ads_3.3.9.bb > index a498918..d28b0c9 100644 > --- a/recipes/samba/samba-ads_3.3.9.bb > +++ b/recipes/samba/samba-ads_3.3.9.bb > @@ -2,7 +2,7 @@ require samba.inc > require samba-ads.inc > LICENSE = "GPLv3" > > -PR = "r3" > +PR = "r4" > SRC_URI += "file://config-lfs.patch \ > file://quota.patch;striplevel=0 \ > file://configure-3.3.0.patch \ > diff --git a/recipes/samba/samba-ads_3.5.6.bb b/recipes/samba/samba-ads_3.5.6.bb > index 1119c1b..cbbd7ac 100644 > --- a/recipes/samba/samba-ads_3.5.6.bb > +++ b/recipes/samba/samba-ads_3.5.6.bb > @@ -2,7 +2,7 @@ require samba.inc > require samba-ads.inc > LICENSE = "GPLv3" > > -PR = "r3" > +PR = "r4" > SRC_URI += "file://config-lfs.patch \ > file://quota.patch;striplevel=0 \ > file://configure-3.3.0.patch \ > diff --git a/recipes/samba/samba-essential_3.0.20.bb b/recipes/samba/samba-essential_3.0.20.bb > index b775080..7b169e0 100644 > --- a/recipes/samba/samba-essential_3.0.20.bb > +++ b/recipes/samba/samba-essential_3.0.20.bb > @@ -1,7 +1,7 @@ > require samba-essential.inc > inherit update-rc.d > > -PR = "r8" > +PR = "r9" > > SRC_URI = "file://config-lfs.patch \ > file://init-essential \ > diff --git a/recipes/samba/samba.inc b/recipes/samba/samba.inc > index e5fa06e..3c38de9 100644 > --- a/recipes/samba/samba.inc > +++ b/recipes/samba/samba.inc > @@ -1,6 +1,6 @@ > SECTION = "console/network" > LICENSE = "GPL" > -DEPENDS = "readline virtual/libiconv talloc" > +DEPENDS = "readline virtual/libiconv talloc avahi" > > SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ > file://volatiles.03_samba \ > @@ -28,6 +28,7 @@ EXTRA_OECONF='--disable-cups \ > --with-readline=${STAGING_LIBDIR}/.. \ > --with-libiconv=${STAGING_LIBDIR}/.. \ > --without-automount \ > + --enable-avahi \ > --with-configdir=${sysconfdir}/samba \ > --with-privatedir=${sysconfdir}/samba/private \ > --with-lockdir=${localstatedir}/lock \ > diff --git a/recipes/samba/samba_3.0.23c.bb b/recipes/samba/samba_3.0.23c.bb > index 27ff058..7c5d738 100644 > --- a/recipes/samba/samba_3.0.23c.bb > +++ b/recipes/samba/samba_3.0.23c.bb > @@ -4,7 +4,7 @@ require samba-basic.inc > SRC_URI += "file://configure.patch \ > file://cifs.patch" > > -PR = "r7" > +PR = "r8" > > EXTRA_OECONF += "\ > --with-smbmount \ > diff --git a/recipes/samba/samba_3.0.34.bb b/recipes/samba/samba_3.0.34.bb > index a5f9b26..05a4159 100644 > --- a/recipes/samba/samba_3.0.34.bb > +++ b/recipes/samba/samba_3.0.34.bb > @@ -5,7 +5,7 @@ SRC_URI += "file://configure.patch \ > " > SRC_URI_append_libc-uclibc = "file://uclibc-strlcpy-strlcat.patch" > > -PR = "r6" > +PR = "r7" > > PACKAGES =+ " smbfs smbfs-doc" > > diff --git a/recipes/samba/samba_3.2.15.bb b/recipes/samba/samba_3.2.15.bb > index 214de58..fb35fe9 100644 > --- a/recipes/samba/samba_3.2.15.bb > +++ b/recipes/samba/samba_3.2.15.bb > @@ -9,7 +9,7 @@ SRC_URI += "file://configure-3.2.8.patch \ > SRC_URI[md5sum] = "5a3bcc4927c9643b9f42970d0815b18f" > SRC_URI[sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46" > > -PR = "r4" > +PR = "r5" > > EXTRA_OECONF += "\ > SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ > diff --git a/recipes/samba/samba_3.3.0.bb b/recipes/samba/samba_3.3.0.bb > index 6fab7dd..6385227 100644 > --- a/recipes/samba/samba_3.3.0.bb > +++ b/recipes/samba/samba_3.3.0.bb > @@ -13,7 +13,7 @@ SRC_URI += "file://configure-3.3.0.patch \ > file://mtab.patch \ > file://tdbheaderfix.patch " > > -PR = "r3" > +PR = "r4" > > EXTRA_OECONF += "\ > SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ > diff --git a/recipes/samba/samba_3.3.9.bb b/recipes/samba/samba_3.3.9.bb > index f8870ac..73c4cc9 100644 > --- a/recipes/samba/samba_3.3.9.bb > +++ b/recipes/samba/samba_3.3.9.bb > @@ -13,7 +13,7 @@ SRC_URI += "file://configure-3.3.0.patch \ > file://mtab.patch \ > file://tdbheaderfix.patch " > > -PR = "r4" > +PR = "r5" > > EXTRA_OECONF += "\ > SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ > diff --git a/recipes/samba/samba_3.5.6.bb b/recipes/samba/samba_3.5.6.bb > index 72bada9..23134a0 100644 > --- a/recipes/samba/samba_3.5.6.bb > +++ b/recipes/samba/samba_3.5.6.bb > @@ -12,7 +12,7 @@ DEFAULT_PREFERENCE = "-1" > SRC_URI += "file://config-h.patch \ > file://tdbheaderfix.patch;apply=no" > > -PR = "r0" > +PR = "r1" > > EXTRA_OECONF += "\ > SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ > -- > 1.7.0.4 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Acked-by: Graeme Gregory <dp@xora.org.uk> On 02/03/2011 23:33, Tom Rini wrote: > avahi is currently an 'auto' thing so we should spell it out to > be clear, set to on. > > Signed-off-by: Tom Rini <tom_rini@mentor.com> > --- > recipes/samba/samba-ads_3.2.15.bb | 2 +- > recipes/samba/samba-ads_3.3.9.bb | 2 +- > recipes/samba/samba-ads_3.5.6.bb | 2 +- > recipes/samba/samba-essential_3.0.20.bb | 2 +- > recipes/samba/samba.inc | 3 ++- > recipes/samba/samba_3.0.23c.bb | 2 +- > recipes/samba/samba_3.0.34.bb | 2 +- > recipes/samba/samba_3.2.15.bb | 2 +- > recipes/samba/samba_3.3.0.bb | 2 +- > recipes/samba/samba_3.3.9.bb | 2 +- > recipes/samba/samba_3.5.6.bb | 2 +- > 11 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/recipes/samba/samba-ads_3.2.15.bb b/recipes/samba/samba-ads_3.2.15.bb > index 002bed7..1579f2c 100644 > --- a/recipes/samba/samba-ads_3.2.15.bb > +++ b/recipes/samba/samba-ads_3.2.15.bb > @@ -2,7 +2,7 @@ require samba.inc > require samba-ads.inc > LICENSE = "GPLv3" > > -PR = "r2" > +PR = "r3" > SRC_URI += "file://config-lfs.patch \ > file://quota.patch;striplevel=0 \ > file://configure-3.2.8.patch \ > diff --git a/recipes/samba/samba-ads_3.3.9.bb b/recipes/samba/samba-ads_3.3.9.bb > index a498918..d28b0c9 100644 > --- a/recipes/samba/samba-ads_3.3.9.bb > +++ b/recipes/samba/samba-ads_3.3.9.bb > @@ -2,7 +2,7 @@ require samba.inc > require samba-ads.inc > LICENSE = "GPLv3" > > -PR = "r3" > +PR = "r4" > SRC_URI += "file://config-lfs.patch \ > file://quota.patch;striplevel=0 \ > file://configure-3.3.0.patch \ > diff --git a/recipes/samba/samba-ads_3.5.6.bb b/recipes/samba/samba-ads_3.5.6.bb > index 1119c1b..cbbd7ac 100644 > --- a/recipes/samba/samba-ads_3.5.6.bb > +++ b/recipes/samba/samba-ads_3.5.6.bb > @@ -2,7 +2,7 @@ require samba.inc > require samba-ads.inc > LICENSE = "GPLv3" > > -PR = "r3" > +PR = "r4" > SRC_URI += "file://config-lfs.patch \ > file://quota.patch;striplevel=0 \ > file://configure-3.3.0.patch \ > diff --git a/recipes/samba/samba-essential_3.0.20.bb b/recipes/samba/samba-essential_3.0.20.bb > index b775080..7b169e0 100644 > --- a/recipes/samba/samba-essential_3.0.20.bb > +++ b/recipes/samba/samba-essential_3.0.20.bb > @@ -1,7 +1,7 @@ > require samba-essential.inc > inherit update-rc.d > > -PR = "r8" > +PR = "r9" > > SRC_URI = "file://config-lfs.patch \ > file://init-essential \ > diff --git a/recipes/samba/samba.inc b/recipes/samba/samba.inc > index e5fa06e..3c38de9 100644 > --- a/recipes/samba/samba.inc > +++ b/recipes/samba/samba.inc > @@ -1,6 +1,6 @@ > SECTION = "console/network" > LICENSE = "GPL" > -DEPENDS = "readline virtual/libiconv talloc" > +DEPENDS = "readline virtual/libiconv talloc avahi" > > SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ > file://volatiles.03_samba \ > @@ -28,6 +28,7 @@ EXTRA_OECONF='--disable-cups \ > --with-readline=${STAGING_LIBDIR}/.. \ > --with-libiconv=${STAGING_LIBDIR}/.. \ > --without-automount \ > + --enable-avahi \ > --with-configdir=${sysconfdir}/samba \ > --with-privatedir=${sysconfdir}/samba/private \ > --with-lockdir=${localstatedir}/lock \ > diff --git a/recipes/samba/samba_3.0.23c.bb b/recipes/samba/samba_3.0.23c.bb > index 27ff058..7c5d738 100644 > --- a/recipes/samba/samba_3.0.23c.bb > +++ b/recipes/samba/samba_3.0.23c.bb > @@ -4,7 +4,7 @@ require samba-basic.inc > SRC_URI += "file://configure.patch \ > file://cifs.patch" > > -PR = "r7" > +PR = "r8" > > EXTRA_OECONF += "\ > --with-smbmount \ > diff --git a/recipes/samba/samba_3.0.34.bb b/recipes/samba/samba_3.0.34.bb > index a5f9b26..05a4159 100644 > --- a/recipes/samba/samba_3.0.34.bb > +++ b/recipes/samba/samba_3.0.34.bb > @@ -5,7 +5,7 @@ SRC_URI += "file://configure.patch \ > " > SRC_URI_append_libc-uclibc = "file://uclibc-strlcpy-strlcat.patch" > > -PR = "r6" > +PR = "r7" > > PACKAGES =+ " smbfs smbfs-doc" > > diff --git a/recipes/samba/samba_3.2.15.bb b/recipes/samba/samba_3.2.15.bb > index 214de58..fb35fe9 100644 > --- a/recipes/samba/samba_3.2.15.bb > +++ b/recipes/samba/samba_3.2.15.bb > @@ -9,7 +9,7 @@ SRC_URI += "file://configure-3.2.8.patch \ > SRC_URI[md5sum] = "5a3bcc4927c9643b9f42970d0815b18f" > SRC_URI[sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46" > > -PR = "r4" > +PR = "r5" > > EXTRA_OECONF += "\ > SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ > diff --git a/recipes/samba/samba_3.3.0.bb b/recipes/samba/samba_3.3.0.bb > index 6fab7dd..6385227 100644 > --- a/recipes/samba/samba_3.3.0.bb > +++ b/recipes/samba/samba_3.3.0.bb > @@ -13,7 +13,7 @@ SRC_URI += "file://configure-3.3.0.patch \ > file://mtab.patch \ > file://tdbheaderfix.patch " > > -PR = "r3" > +PR = "r4" > > EXTRA_OECONF += "\ > SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ > diff --git a/recipes/samba/samba_3.3.9.bb b/recipes/samba/samba_3.3.9.bb > index f8870ac..73c4cc9 100644 > --- a/recipes/samba/samba_3.3.9.bb > +++ b/recipes/samba/samba_3.3.9.bb > @@ -13,7 +13,7 @@ SRC_URI += "file://configure-3.3.0.patch \ > file://mtab.patch \ > file://tdbheaderfix.patch " > > -PR = "r4" > +PR = "r5" > > EXTRA_OECONF += "\ > SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ > diff --git a/recipes/samba/samba_3.5.6.bb b/recipes/samba/samba_3.5.6.bb > index 72bada9..23134a0 100644 > --- a/recipes/samba/samba_3.5.6.bb > +++ b/recipes/samba/samba_3.5.6.bb > @@ -12,7 +12,7 @@ DEFAULT_PREFERENCE = "-1" > SRC_URI += "file://config-h.patch \ > file://tdbheaderfix.patch;apply=no" > > -PR = "r0" > +PR = "r1" > > EXTRA_OECONF += "\ > SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
Patch
diff --git a/recipes/samba/samba-ads_3.2.15.bb b/recipes/samba/samba-ads_3.2.15.bb index 002bed7..1579f2c 100644 --- a/recipes/samba/samba-ads_3.2.15.bb +++ b/recipes/samba/samba-ads_3.2.15.bb @@ -2,7 +2,7 @@ require samba.inc require samba-ads.inc LICENSE = "GPLv3" -PR = "r2" +PR = "r3" SRC_URI += "file://config-lfs.patch \ file://quota.patch;striplevel=0 \ file://configure-3.2.8.patch \ diff --git a/recipes/samba/samba-ads_3.3.9.bb b/recipes/samba/samba-ads_3.3.9.bb index a498918..d28b0c9 100644 --- a/recipes/samba/samba-ads_3.3.9.bb +++ b/recipes/samba/samba-ads_3.3.9.bb @@ -2,7 +2,7 @@ require samba.inc require samba-ads.inc LICENSE = "GPLv3" -PR = "r3" +PR = "r4" SRC_URI += "file://config-lfs.patch \ file://quota.patch;striplevel=0 \ file://configure-3.3.0.patch \ diff --git a/recipes/samba/samba-ads_3.5.6.bb b/recipes/samba/samba-ads_3.5.6.bb index 1119c1b..cbbd7ac 100644 --- a/recipes/samba/samba-ads_3.5.6.bb +++ b/recipes/samba/samba-ads_3.5.6.bb @@ -2,7 +2,7 @@ require samba.inc require samba-ads.inc LICENSE = "GPLv3" -PR = "r3" +PR = "r4" SRC_URI += "file://config-lfs.patch \ file://quota.patch;striplevel=0 \ file://configure-3.3.0.patch \ diff --git a/recipes/samba/samba-essential_3.0.20.bb b/recipes/samba/samba-essential_3.0.20.bb index b775080..7b169e0 100644 --- a/recipes/samba/samba-essential_3.0.20.bb +++ b/recipes/samba/samba-essential_3.0.20.bb @@ -1,7 +1,7 @@ require samba-essential.inc inherit update-rc.d -PR = "r8" +PR = "r9" SRC_URI = "file://config-lfs.patch \ file://init-essential \ diff --git a/recipes/samba/samba.inc b/recipes/samba/samba.inc index e5fa06e..3c38de9 100644 --- a/recipes/samba/samba.inc +++ b/recipes/samba/samba.inc @@ -1,6 +1,6 @@ SECTION = "console/network" LICENSE = "GPL" -DEPENDS = "readline virtual/libiconv talloc" +DEPENDS = "readline virtual/libiconv talloc avahi" SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ @@ -28,6 +28,7 @@ EXTRA_OECONF='--disable-cups \ --with-readline=${STAGING_LIBDIR}/.. \ --with-libiconv=${STAGING_LIBDIR}/.. \ --without-automount \ + --enable-avahi \ --with-configdir=${sysconfdir}/samba \ --with-privatedir=${sysconfdir}/samba/private \ --with-lockdir=${localstatedir}/lock \ diff --git a/recipes/samba/samba_3.0.23c.bb b/recipes/samba/samba_3.0.23c.bb index 27ff058..7c5d738 100644 --- a/recipes/samba/samba_3.0.23c.bb +++ b/recipes/samba/samba_3.0.23c.bb @@ -4,7 +4,7 @@ require samba-basic.inc SRC_URI += "file://configure.patch \ file://cifs.patch" -PR = "r7" +PR = "r8" EXTRA_OECONF += "\ --with-smbmount \ diff --git a/recipes/samba/samba_3.0.34.bb b/recipes/samba/samba_3.0.34.bb index a5f9b26..05a4159 100644 --- a/recipes/samba/samba_3.0.34.bb +++ b/recipes/samba/samba_3.0.34.bb @@ -5,7 +5,7 @@ SRC_URI += "file://configure.patch \ " SRC_URI_append_libc-uclibc = "file://uclibc-strlcpy-strlcat.patch" -PR = "r6" +PR = "r7" PACKAGES =+ " smbfs smbfs-doc" diff --git a/recipes/samba/samba_3.2.15.bb b/recipes/samba/samba_3.2.15.bb index 214de58..fb35fe9 100644 --- a/recipes/samba/samba_3.2.15.bb +++ b/recipes/samba/samba_3.2.15.bb @@ -9,7 +9,7 @@ SRC_URI += "file://configure-3.2.8.patch \ SRC_URI[md5sum] = "5a3bcc4927c9643b9f42970d0815b18f" SRC_URI[sha256sum] = "84281fd1faeffee8558e49dff865dd382abbf78bc1be00f8cb5aa70aeea67d46" -PR = "r4" +PR = "r5" EXTRA_OECONF += "\ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ diff --git a/recipes/samba/samba_3.3.0.bb b/recipes/samba/samba_3.3.0.bb index 6fab7dd..6385227 100644 --- a/recipes/samba/samba_3.3.0.bb +++ b/recipes/samba/samba_3.3.0.bb @@ -13,7 +13,7 @@ SRC_URI += "file://configure-3.3.0.patch \ file://mtab.patch \ file://tdbheaderfix.patch " -PR = "r3" +PR = "r4" EXTRA_OECONF += "\ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ diff --git a/recipes/samba/samba_3.3.9.bb b/recipes/samba/samba_3.3.9.bb index f8870ac..73c4cc9 100644 --- a/recipes/samba/samba_3.3.9.bb +++ b/recipes/samba/samba_3.3.9.bb @@ -13,7 +13,7 @@ SRC_URI += "file://configure-3.3.0.patch \ file://mtab.patch \ file://tdbheaderfix.patch " -PR = "r4" +PR = "r5" EXTRA_OECONF += "\ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ diff --git a/recipes/samba/samba_3.5.6.bb b/recipes/samba/samba_3.5.6.bb index 72bada9..23134a0 100644 --- a/recipes/samba/samba_3.5.6.bb +++ b/recipes/samba/samba_3.5.6.bb @@ -12,7 +12,7 @@ DEFAULT_PREFERENCE = "-1" SRC_URI += "file://config-h.patch \ file://tdbheaderfix.patch;apply=no" -PR = "r0" +PR = "r1" EXTRA_OECONF += "\ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
avahi is currently an 'auto' thing so we should spell it out to be clear, set to on. Signed-off-by: Tom Rini <tom_rini@mentor.com> --- recipes/samba/samba-ads_3.2.15.bb | 2 +- recipes/samba/samba-ads_3.3.9.bb | 2 +- recipes/samba/samba-ads_3.5.6.bb | 2 +- recipes/samba/samba-essential_3.0.20.bb | 2 +- recipes/samba/samba.inc | 3 ++- recipes/samba/samba_3.0.23c.bb | 2 +- recipes/samba/samba_3.0.34.bb | 2 +- recipes/samba/samba_3.2.15.bb | 2 +- recipes/samba/samba_3.3.0.bb | 2 +- recipes/samba/samba_3.3.9.bb | 2 +- recipes/samba/samba_3.5.6.bb | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-)