[oe-commits] org.oe.dev samba: Make fetching more robust (closes 1885). Unify some more. Sanitize.
Laibsch commit
openembedded-commits at lists.openembedded.org
Mon Feb 19 07:22:09 UTC 2007
samba: Make fetching more robust (closes 1885). Unify some more. Sanitize.
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 72dbfb4acd1c78f1e02cad2d3614011b5a6cd099
ViewMTN: http://monotone.openembedded.org/revision.psp?id=72dbfb4acd1c78f1e02cad2d3614011b5a6cd099
Files:
1
packages/samba/samba-essential.inc
packages/samba/samba-essential_3.0.20.bb
packages/samba/samba.inc
packages/samba/samba_3.0.10.bb
packages/samba/samba_3.0.14a.bb
packages/samba/samba_3.0.20.bb
packages/samba/samba_3.0.23c.bb
packages/samba/samba_3.0.5.bb
packages/samba/samba_3.0.9.bb
Diffs:
#
# mt diff -rc34a7087ad4a7aaeb540fbc6233636045d2dc2f7 -r72dbfb4acd1c78f1e02cad2d3614011b5a6cd099
#
#
#
# patch "packages/samba/samba-essential.inc"
# from [192297d0cdf2f3de7a7bf541c2f6ac146919ea43]
# to [2456892f32d81c4ae702f04a0ad7c83a8a905fd0]
#
# patch "packages/samba/samba-essential_3.0.20.bb"
# from [a9a692073f8db823a67187dcbd7ad413ba22a82b]
# to [79344126cf7248cd03678738543aba6c774308ac]
#
# patch "packages/samba/samba.inc"
# from [7e360fd6c2939648755300154f37c2a11edbe475]
# to [ce3be8319f8a58fc27ea8888ae3cc05bb5a39391]
#
# patch "packages/samba/samba_3.0.10.bb"
# from [cc54fe86fd7b20a047c0c68c2b44275c4a184c27]
# to [91586326d34250a76373b8f0f463b1ce410ae6f7]
#
# patch "packages/samba/samba_3.0.14a.bb"
# from [1c6f4e573ac1a4f4e068c63faa964f69184cd86e]
# to [f2cb1ee6a99a760ecfcaf60a33cbb3f886739058]
#
# patch "packages/samba/samba_3.0.20.bb"
# from [97e09945dd2b676b5cbf54b65f33097ae55226cd]
# to [59ef4fedfcccc9793317fb4b36075d610e8de000]
#
# patch "packages/samba/samba_3.0.23c.bb"
# from [9c2520550c009d423c4c6eae474246fad245c986]
# to [845a45894e30a0fa967fb1fcf3001c2382d9bd7a]
#
# patch "packages/samba/samba_3.0.5.bb"
# from [cc54fe86fd7b20a047c0c68c2b44275c4a184c27]
# to [91586326d34250a76373b8f0f463b1ce410ae6f7]
#
# patch "packages/samba/samba_3.0.9.bb"
# from [cc54fe86fd7b20a047c0c68c2b44275c4a184c27]
# to [91586326d34250a76373b8f0f463b1ce410ae6f7]
#
============================================================
--- packages/samba/samba-essential.inc 192297d0cdf2f3de7a7bf541c2f6ac146919ea43
+++ packages/samba/samba-essential.inc 2456892f32d81c4ae702f04a0ad7c83a8a905fd0
@@ -1,10 +1,15 @@ SECTION = "console/network"
SECTION = "console/network"
+LICENSE = "GPL"
DEPENDS = "readline"
-LICENSE = "GPL"
+SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
+ file://configure.patch;patch=1 \
+ file://cifs.patch;patch=1"
+S = "${WORKDIR}/samba-${PV}/source"
+
inherit autotools
-EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
+EXTRA_OECONF = '--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
--without-ads --without-automount --without-smbmount --without-syslog \
--without-ldapsam --without-quotas --without-nisplus-home \
--without-sys-quotas --without-libsmbclient --without-winbind \
============================================================
--- packages/samba/samba-essential_3.0.20.bb a9a692073f8db823a67187dcbd7ad413ba22a82b
+++ packages/samba/samba-essential_3.0.20.bb 79344126cf7248cd03678738543aba6c774308ac
@@ -1,22 +1,17 @@
+require samba-essential.inc
+inherit update-rc.d
+
PR = "r5"
-SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://cifs.patch;patch=1 \
- file://config-lfs.patch;patch=1 \
+SRC_URI = "file://config-lfs.patch;patch=1 \
file://init-essential \
file://quota.patch;patch=1;pnum=0 \
file://smb-essential.conf \
file://smb-essential-inactive.conf \
file://Managing-Samba.txt"
-S := "${WORKDIR}/samba-${PV}/source"
-
RCONFLICTS = "samba"
-require samba-essential.inc
-inherit update-rc.d
-
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
============================================================
--- packages/samba/samba.inc 7e360fd6c2939648755300154f37c2a11edbe475
+++ packages/samba/samba.inc ce3be8319f8a58fc27ea8888ae3cc05bb5a39391
@@ -1,17 +1,23 @@ SECTION = "console/network"
SECTION = "console/network"
+LICENSE = "GPL"
DEPENDS = "readline"
-LICENSE = "GPL"
+SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
+ file://configure.patch;patch=1 \
+ file://cifs.patch;patch=1"
+S = "${WORKDIR}/samba-${PV}/source"
+
+inherit autotools
+
+EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
+ --without-ads --without-automount --with-smbmount'
+
PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc"
FILES_cifs = "${bindir}/mount.cifs"
FILES_cifs-doc = "${docdir}/mount.cifs.8"
FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
-inherit autotools
-
-EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
- --without-ads --without-automount --with-smbmount'
do_configure_prepend () {
./script/mkversion.sh
if [ ! -e acinclude.m4 ]; then
============================================================
--- packages/samba/samba_3.0.10.bb cc54fe86fd7b20a047c0c68c2b44275c4a184c27
+++ packages/samba/samba_3.0.10.bb 91586326d34250a76373b8f0f463b1ce410ae6f7
@@ -1,6 +1 @@
-SRC_URI := "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://${FILESDIR}/configure.patch;patch=1 \
- file://${FILESDIR}/cifs.patch;patch=1"
-S := "${WORKDIR}/${P}/source"
-
require samba.inc
============================================================
--- packages/samba/samba_3.0.14a.bb 1c6f4e573ac1a4f4e068c63faa964f69184cd86e
+++ packages/samba/samba_3.0.14a.bb f2cb1ee6a99a760ecfcaf60a33cbb3f886739058
@@ -1,17 +1,13 @@
+require samba.inc
+inherit update-rc.d
+
PR = "r15"
-SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://cifs.patch;patch=1 \
- file://config-lfs.patch;patch=1 \
+SRC_URI += "file://config-lfs.patch;patch=1 \
file://init \
file://quota.patch;patch=1;pnum=0 \
"
-S = "${WORKDIR}/${P}/source"
-require samba.inc
-inherit update-rc.d
-
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
============================================================
--- packages/samba/samba_3.0.20.bb 97e09945dd2b676b5cbf54b65f33097ae55226cd
+++ packages/samba/samba_3.0.20.bb 59ef4fedfcccc9793317fb4b36075d610e8de000
@@ -1,17 +1,13 @@
+require samba.inc
+inherit update-rc.d
+
PR = "r5"
-SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://cifs.patch;patch=1 \
- file://config-lfs.patch;patch=1 \
+SRC_URI += "file://config-lfs.patch;patch=1 \
file://init \
file://quota.patch;patch=1;pnum=0 \
"
-S = "${WORKDIR}/${P}/source"
-require samba.inc
-inherit update-rc.d
-
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
============================================================
--- packages/samba/samba_3.0.23c.bb 9c2520550c009d423c4c6eae474246fad245c986
+++ packages/samba/samba_3.0.23c.bb 845a45894e30a0fa967fb1fcf3001c2382d9bd7a
@@ -1,17 +1,11 @@
-PR = "r0"
+require samba.inc
+inherit update-rc.d
-SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://cifs.patch;patch=1 \
- file://config-lfs.patch;patch=1 \
+SRC_URI += "file://config-lfs.patch;patch=1 \
file://init \
file://quota.patch;patch=1;pnum=0 \
"
-S = "${WORKDIR}/${P}/source"
-include samba.inc
-inherit update-rc.d
-
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
============================================================
--- packages/samba/samba_3.0.5.bb cc54fe86fd7b20a047c0c68c2b44275c4a184c27
+++ packages/samba/samba_3.0.5.bb 91586326d34250a76373b8f0f463b1ce410ae6f7
@@ -1,6 +1 @@
-SRC_URI := "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://${FILESDIR}/configure.patch;patch=1 \
- file://${FILESDIR}/cifs.patch;patch=1"
-S := "${WORKDIR}/${P}/source"
-
require samba.inc
============================================================
--- packages/samba/samba_3.0.9.bb cc54fe86fd7b20a047c0c68c2b44275c4a184c27
+++ packages/samba/samba_3.0.9.bb 91586326d34250a76373b8f0f463b1ce410ae6f7
@@ -1,6 +1 @@
-SRC_URI := "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://${FILESDIR}/configure.patch;patch=1 \
- file://${FILESDIR}/cifs.patch;patch=1"
-S := "${WORKDIR}/${P}/source"
-
require samba.inc
More information about the Openembedded-commits
mailing list