summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-08-22 17:06:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 23:45:53 +0100
commitcc3c028b64d275912fe2be227e1cebe836b53eb3 (patch)
treea8764232ebbdd77e54cc73777b673a30a74b6987
parent7e157da949f215bfd0427145ee6aae4d09e44ddc (diff)
downloadpoky-cc3c028b64d275912fe2be227e1cebe836b53eb3.tar.gz
rsync: use rsync.inc to avoid duplicated codes
There are two versions of rsync but the rsync.inc is only used by 3.x, there are duplicated codes in 2.x, so this commit include changes: * remove duplicated codes in 2.x and require the inc * move the LICENSE from inc to each bb (From OE-Core rev: 6817b6e02c2c042aa883fb4a359871c4b966ec4b) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rsync/rsync.inc5
-rw-r--r--meta/recipes-devtools/rsync/rsync_2.6.9.bb23
-rw-r--r--meta/recipes-devtools/rsync/rsync_3.1.2.bb4
3 files changed, 8 insertions, 24 deletions
diff --git a/meta/recipes-devtools/rsync/rsync.inc b/meta/recipes-devtools/rsync/rsync.inc
index c65f270312..8739c9c620 100644
--- a/meta/recipes-devtools/rsync/rsync.inc
+++ b/meta/recipes-devtools/rsync/rsync.inc
@@ -3,11 +3,6 @@ HOMEPAGE = "http://rsync.samba.org/"
3BUGTRACKER = "http://rsync.samba.org/bugzilla.html" 3BUGTRACKER = "http://rsync.samba.org/bugzilla.html"
4SECTION = "console/network" 4SECTION = "console/network"
5 5
6# GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0)
7LICENSE = "GPLv3+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
9
10# needs to add acl and attr
11DEPENDS = "popt" 6DEPENDS = "popt"
12 7
13SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \ 8SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \
diff --git a/meta/recipes-devtools/rsync/rsync_2.6.9.bb b/meta/recipes-devtools/rsync/rsync_2.6.9.bb
index 6854c77f74..5a19e21a03 100644
--- a/meta/recipes-devtools/rsync/rsync_2.6.9.bb
+++ b/meta/recipes-devtools/rsync/rsync_2.6.9.bb
@@ -1,27 +1,12 @@
1SUMMARY = "File synchronization tool" 1require rsync.inc
2HOMEPAGE = "http://rsync.samba.org/"
3BUGTRACKER = "http://rsync.samba.org/bugzilla.html"
4SECTION = "console/network"
5 2
6# needs to add acl and attr 3SRC_URI += "file://rsync-2.6.9-fname-obo.patch \
7DEPENDS = "popt" 4 file://rsyncd.conf \
8 5"
9SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \
10 file://rsync-2.6.9-fname-obo.patch \
11 file://rsyncd.conf"
12 6
13SRC_URI[md5sum] = "996d8d8831dbca17910094e56dcb5942" 7SRC_URI[md5sum] = "996d8d8831dbca17910094e56dcb5942"
14SRC_URI[sha256sum] = "ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9" 8SRC_URI[sha256sum] = "ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9"
15 9
16inherit autotools
17
18do_install_append() {
19 install -d ${D}${sysconfdir}
20 install -m 0644 ${WORKDIR}/rsyncd.conf ${D}${sysconfdir}
21}
22
23EXTRA_OEMAKE='STRIP=""'
24
25LICENSE = "GPLv2+" 10LICENSE = "GPLv2+"
26LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c" 11LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c"
27 12
diff --git a/meta/recipes-devtools/rsync/rsync_3.1.2.bb b/meta/recipes-devtools/rsync/rsync_3.1.2.bb
index 9637ed4e77..798fecc271 100644
--- a/meta/recipes-devtools/rsync/rsync_3.1.2.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.1.2.bb
@@ -5,6 +5,10 @@ SRC_URI += "file://makefile-no-rebuild.patch"
5SRC_URI[md5sum] = "0f758d7e000c0f7f7d3792610fad70cb" 5SRC_URI[md5sum] = "0f758d7e000c0f7f7d3792610fad70cb"
6SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2" 6SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2"
7 7
8# GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0)
9LICENSE = "GPLv3+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
11
8PACKAGECONFIG ??= "acl attr" 12PACKAGECONFIG ??= "acl attr"
9PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl," 13PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl,"
10PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr," 14PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr,"