From 6817b6e02c2c042aa883fb4a359871c4b966ec4b Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 22 Aug 2016 17:06:06 +0800 Subject: 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 Signed-off-by: Jackie Huang Signed-off-by: Richard Purdie --- meta/recipes-devtools/rsync/rsync.inc | 5 ----- meta/recipes-devtools/rsync/rsync_2.6.9.bb | 23 ++++------------------- meta/recipes-devtools/rsync/rsync_3.1.2.bb | 4 ++++ 3 files changed, 8 insertions(+), 24 deletions(-) (limited to 'meta/recipes-devtools/rsync') 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/" BUGTRACKER = "http://rsync.samba.org/bugzilla.html" SECTION = "console/network" -# GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -# needs to add acl and attr DEPENDS = "popt" SRC_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 @@ -SUMMARY = "File synchronization tool" -HOMEPAGE = "http://rsync.samba.org/" -BUGTRACKER = "http://rsync.samba.org/bugzilla.html" -SECTION = "console/network" +require rsync.inc -# needs to add acl and attr -DEPENDS = "popt" - -SRC_URI = "http://rsync.samba.org/ftp/rsync/src/rsync-${PV}.tar.gz \ - file://rsync-2.6.9-fname-obo.patch \ - file://rsyncd.conf" +SRC_URI += "file://rsync-2.6.9-fname-obo.patch \ + file://rsyncd.conf \ +" SRC_URI[md5sum] = "996d8d8831dbca17910094e56dcb5942" SRC_URI[sha256sum] = "ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9" -inherit autotools - -do_install_append() { - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/rsyncd.conf ${D}${sysconfdir} -} - -EXTRA_OEMAKE='STRIP=""' - LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c" 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" SRC_URI[md5sum] = "0f758d7e000c0f7f7d3792610fad70cb" SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2" +# GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0) +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + PACKAGECONFIG ??= "acl attr" PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl," PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr," -- cgit 1.2.3-korg