merge of 'a675a323523cfdb282fa64bd2a0e42d19d71db33'

     and 'b67dfab13ef7114048f172a8cce5a15a5e2f5b07'

5 files changed, 0 insertions, 111 deletions

diff --git a/packages/samba/samba_3.0.10.bb b/packages/samba/samba_3.0.10.bb
deleted file mode 100644
index 265f695a1d..0000000000
--- a/packages/samba/samba_3.0.10.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require samba.inc
-
-PR = "r1"
diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb
deleted file mode 100644
index 90d3c947d6..0000000000
--- a/packages/samba/samba_3.0.14a.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-require samba.inc
-inherit update-rc.d
-
-PR = "r16"
-
-SRC_URI += "file://config-lfs.patch;patch=1 \
-	   file://init \
-           file://quota.patch;patch=1;pnum=0 \
-	   "
-
-INITSCRIPT_NAME = "samba"
-# No dependencies, goes in at level 20 (NOTE: take care with the
-# level, later levels put the shutdown later too - see the links
-# in rc6.d, the shutdown must precede network shutdown).
-INITSCRIPT_PARAMS = "defaults"
-CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
-
-# The file system settings --foodir=dirfoo and overridden unconditionally
-# in the samba config by --with-foodir=dirfoo - even if the --with is not
-# specified!  Fix that here.  Set the privatedir to /etc/samba/private.
-EXTRA_OECONF += "\
-	--with-configdir=${sysconfdir}/samba \
-	--with-privatedir=${sysconfdir}/samba/private \
-	--with-lockdir=${localstatedir}/lock \
-	--with-piddir=${localstatedir}/run \
-	--with-logfilebase=${localstatedir}/log \
-	--with-libdir=${libdir} \
-	--with-mandir=${mandir} \
-	--with-swatdir=${datadir}/swat \
-	"
-
-do_install_append() {
-	install -d "${D}${localstatedir}/log"
-	rm -f ${D}/sbin/mount.smbfs
-	rmdir ${D}/sbin
-	install -d ${D}${sbindir}
-	ln -sf smbmount ${D}${sbindir}/mount.smbfs
-	install -d "${D}${sysconfdir}/init.d"
-	install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
-	install -d "${D}${sysconfdir}/samba"
-	install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf
-}
-
-PACKAGES =+ "swat"
-
-FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
-FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat"
-FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so"
-#
-# bug fix for samba.inc:
-FILES_cifs-doc += "${mandir}/man8/mount.cifs.8"
diff --git a/packages/samba/samba_3.0.20.bb b/packages/samba/samba_3.0.20.bb
deleted file mode 100644
index a4ca7e9265..0000000000
--- a/packages/samba/samba_3.0.20.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-require samba.inc
-inherit update-rc.d
-
-PR = "r6"
-
-SRC_URI += "file://config-lfs.patch;patch=1 \
-	   file://init \
-           file://quota.patch;patch=1;pnum=0 \
-	   "
-
-INITSCRIPT_NAME = "samba"
-# No dependencies, goes in at level 20 (NOTE: take care with the
-# level, later levels put the shutdown later too - see the links
-# in rc6.d, the shutdown must precede network shutdown).
-INITSCRIPT_PARAMS = "defaults"
-CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
-
-# The file system settings --foodir=dirfoo and overridden unconditionally
-# in the samba config by --with-foodir=dirfoo - even if the --with is not
-# specified!  Fix that here.  Set the privatedir to /etc/samba/private.
-EXTRA_OECONF += "\
-	samba_cv_struct_timespec=yes \
-	--with-configdir=${sysconfdir}/samba \
-	--with-privatedir=${sysconfdir}/samba/private \
-	--with-lockdir=${localstatedir}/lock \
-	--with-piddir=${localstatedir}/run \
-	--with-logfilebase=${localstatedir}/log \
-	--with-libdir=${libdir} \
-	--with-mandir=${mandir} \
-	--with-swatdir=${datadir}/swat \
-	"
-
-do_install_append() {
-	install -d "${D}${localstatedir}/log"
-	rm -f ${D}/sbin/mount.smbfs
-	rmdir ${D}/sbin
-	ln -sf smbmount ${D}${sbindir}/mount.smbfs
-	install -d "${D}${sysconfdir}/init.d"
-	install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
-	install -d "${D}${sysconfdir}/samba"
-	install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf
-}
-
-PACKAGES =+ "swat"
-
-FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
-FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat"
-FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so"
-#
-# bug fix for samba.inc:
-FILES_cifs-doc += "${mandir}/man8/mount.cifs.8"
diff --git a/packages/samba/samba_3.0.5.bb b/packages/samba/samba_3.0.5.bb
deleted file mode 100644
index 265f695a1d..0000000000
--- a/packages/samba/samba_3.0.5.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require samba.inc
-
-PR = "r1"
diff --git a/packages/samba/samba_3.0.9.bb b/packages/samba/samba_3.0.9.bb
deleted file mode 100644
index 265f695a1d..0000000000
--- a/packages/samba/samba_3.0.9.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require samba.inc
-
-PR = "r1"