[oe-commits] Tim 'timtim' Ellis : samba: 3.0.33 -> 3.0.34, also small change to 3.2. 7 to merge stuff better in samba.inc
GIT User account
git at amethyst.openembedded.net
Mon Jan 26 00:02:32 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: eb8099e4b7f1ea1766ae4352020b0e709eca999e
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=eb8099e4b7f1ea1766ae4352020b0e709eca999e
Author: Tim 'timtim' Ellis <tim.ellis at foonas.org>
Date: Mon Jan 26 00:00:58 2009 +0000
samba: 3.0.33 -> 3.0.34, also small change to 3.2.7 to merge stuff better in samba.inc
---
.../{samba-3.0.33 => samba-3.0.34}/configure.patch | 0
.../samba/{samba-3.0.33 => samba-3.0.34}/smb.conf | 0
packages/samba/samba.inc | 1 -
.../samba/{samba_3.0.33.bb => samba_3.0.34.bb} | 7 ++++++-
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
similarity index 100%
rename from packages/samba/samba-3.0.33/configure.patch
rename to 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
similarity index 100%
rename from packages/samba/samba-3.0.33/smb.conf
rename to packages/samba/samba-3.0.34/smb.conf
diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index b962a63..260230b 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
similarity index 92%
rename from packages/samba/samba_3.0.33.bb
rename to packages/samba/samba_3.0.34.bb
index a1aeccf..07a8bac 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 4c4c43b..ec51568 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"
More information about the Openembedded-commits
mailing list