diff options
| author | Tim 'timtim' Ellis <tim.ellis@foonas.org> | 2009-01-26 00:00:58 +0000 |
|---|---|---|
| committer | Tim 'timtim' Ellis <tim.ellis@foonas.org> | 2009-01-26 00:00:58 +0000 |
| commit | eb8099e4b7f1ea1766ae4352020b0e709eca999e (patch) | |
| tree | 8f2b8fbc4163dea776d29924bd92032a324a1b29 | |
| parent | 332ea26ea06f212d2fc483e802e26803d4da41bf (diff) | |
samba: 3.0.33 -> 3.0.34, also small change to 3.2.7 to merge stuff better in samba.inc
| -rw-r--r-- | packages/samba/samba-3.0.34/configure.patch (renamed from packages/samba/samba-3.0.33/configure.patch) | 0 | ||||
| -rw-r--r-- | packages/samba/samba-3.0.34/smb.conf (renamed from packages/samba/samba-3.0.33/smb.conf) | 0 | ||||
| -rw-r--r-- | packages/samba/samba.inc | 1 | ||||
| -rw-r--r-- | packages/samba/samba_3.0.34.bb (renamed from packages/samba/samba_3.0.33.bb) | 7 | ||||
| -rw-r--r-- | packages/samba/samba_3.2.7.bb | 6 |
5 files changed, 6 insertions, 8 deletions
diff --git a/packages/samba/samba-3.0.33/configure.patch b/packages/samba/samba-3.0.34/configure.patch index ddcb9e9a15..ddcb9e9a15 100644 --- a/packages/samba/samba-3.0.33/configure.patch +++ b/packages/samba/samba-3.0.34/configure.patch diff --git a/packages/samba/samba-3.0.33/smb.conf b/packages/samba/samba-3.0.34/smb.conf index 3854621c3e..3854621c3e 100644 --- a/packages/samba/samba-3.0.33/smb.conf +++ b/packages/samba/samba-3.0.34/smb.conf diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc index b962a63a3c..260230b386 100644 --- a/packages/samba/samba.inc +++ b/packages/samba/samba.inc @@ -32,7 +32,6 @@ do_configure_prepend () { do_compile () { oe_runmake proto_exists base_do_compile - ${CC} client/mount.cifs.c -o mount.cifs } do_install_append() { diff --git a/packages/samba/samba_3.0.33.bb b/packages/samba/samba_3.0.34.bb index a1aeccf59f..07a8bac8ee 100644 --- a/packages/samba/samba_3.0.33.bb +++ b/packages/samba/samba_3.0.34.bb @@ -1,7 +1,7 @@ require samba.inc inherit update-rc.d -PR = "r8" +PR = "r0" SRC_URI += "file://config-lfs.patch;patch=1 \ file://quota.patch;patch=1;pnum=0 \ @@ -43,6 +43,11 @@ do_install_append() { install -d ${D}/var/spool/samba } +do_stage() { + install -m 0644 include/libsmbclient.h ${STAGING_INCDIR} + oe_libinstall -C bin -a -so libsmbclient ${STAGING_LIBDIR} +} + PACKAGES =+ "swat" FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" diff --git a/packages/samba/samba_3.2.7.bb b/packages/samba/samba_3.2.7.bb index 4c4c43bcd2..ec51568313 100644 --- a/packages/samba/samba_3.2.7.bb +++ b/packages/samba/samba_3.2.7.bb @@ -47,12 +47,6 @@ do_configure() { oe_runconf } -# Override samba.inc because building mount.cifs separately not necessary anymore and causes issues -do_compile () { - oe_runmake proto_exists - base_do_compile -} - do_install_append() { install -d "${D}/var/log/samba" install -d "${D}${sysconfdir}/init.d" |