summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-06-15 11:47:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-18 11:07:57 +0100
commit1ecb384c110706f210f9b3bc66772a2f5d89e904 (patch)
treea329bfbc74b297e4553b1a0599faefb1a6a7f38c
parent44b185581d2635bbd9494086018c64314ab83934 (diff)
downloadpoky-1ecb384c110706f210f9b3bc66772a2f5d89e904.tar.gz
rsync: merge rsync.inc into the rsync recipe
There's only one user of rsync.inc (meta-gplv2 has its own copy), so merge the .inc file into the rsync recipe. (From OE-Core rev: 4e42ad44f1df510a527d199b6ec41541f8939654) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/rsync/rsync.inc20
-rw-r--r--meta/recipes-devtools/rsync/rsync_3.1.3.bb28
2 files changed, 23 insertions, 25 deletions
diff --git a/meta/recipes-devtools/rsync/rsync.inc b/meta/recipes-devtools/rsync/rsync.inc
deleted file mode 100644
index 26c023af7a..0000000000
--- a/meta/recipes-devtools/rsync/rsync.inc
+++ /dev/null
@@ -1,20 +0,0 @@
1SUMMARY = "File synchronization tool"
2HOMEPAGE = "http://rsync.samba.org/"
3BUGTRACKER = "http://rsync.samba.org/bugzilla.html"
4SECTION = "console/network"
5
6DEPENDS = "popt"
7
8SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \
9 file://rsyncd.conf"
10
11inherit autotools
12
13do_install_append() {
14 install -d ${D}${sysconfdir}
15 install -m 0644 ${WORKDIR}/rsyncd.conf ${D}${sysconfdir}
16}
17
18EXTRA_OEMAKE='STRIP=""'
19
20PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
diff --git a/meta/recipes-devtools/rsync/rsync_3.1.3.bb b/meta/recipes-devtools/rsync/rsync_3.1.3.bb
index 84a02586be..29cb231f36 100644
--- a/meta/recipes-devtools/rsync/rsync_3.1.3.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.1.3.bb
@@ -1,24 +1,37 @@
1require rsync.inc 1SUMMARY = "File synchronization tool"
2HOMEPAGE = "http://rsync.samba.org/"
3BUGTRACKER = "http://rsync.samba.org/bugzilla.html"
4SECTION = "console/network"
5# GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0)
6LICENSE = "GPLv3+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
2 8
3SRC_URI += "file://makefile-no-rebuild.patch" 9DEPENDS = "popt"
10
11SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \
12 file://rsyncd.conf \
13 file://makefile-no-rebuild.patch \
14"
4 15
5SRC_URI[md5sum] = "1581a588fde9d89f6bc6201e8129afaf" 16SRC_URI[md5sum] = "1581a588fde9d89f6bc6201e8129afaf"
6SRC_URI[sha256sum] = "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0" 17SRC_URI[sha256sum] = "55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0"
7 18
8# GPLv2+ (<< 3.0.0), GPLv3+ (>= 3.0.0) 19inherit autotools
9LICENSE = "GPLv3+"
10LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
11 20
12PACKAGECONFIG ??= "acl attr \ 21PACKAGECONFIG ??= "acl attr \
13 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ 22 ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
14" 23"
24
15PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl," 25PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl,"
16PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr," 26PACKAGECONFIG[attr] = "--enable-xattr-support,--disable-xattr-support,attr,"
27PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
17 28
18# By default, if crosscompiling, rsync disables a number of 29# By default, if crosscompiling, rsync disables a number of
19# capabilities, hardlinking symlinks and special files (i.e. devices) 30# capabilities, hardlinking symlinks and special files (i.e. devices)
20CACHED_CONFIGUREVARS += "rsync_cv_can_hardlink_special=yes rsync_cv_can_hardlink_symlink=yes" 31CACHED_CONFIGUREVARS += "rsync_cv_can_hardlink_special=yes rsync_cv_can_hardlink_symlink=yes"
21 32
33EXTRA_OEMAKE = 'STRIP=""'
34
22# rsync 3.0 uses configure.sh instead of configure, and 35# rsync 3.0 uses configure.sh instead of configure, and
23# makefile checks the existence of configure.sh 36# makefile checks the existence of configure.sh
24do_configure_prepend () { 37do_configure_prepend () {
@@ -29,4 +42,9 @@ do_configure_append () {
29 cp -f ${S}/configure ${S}/configure.sh 42 cp -f ${S}/configure ${S}/configure.sh
30} 43}
31 44
45do_install_append() {
46 install -d ${D}${sysconfdir}
47 install -m 0644 ${WORKDIR}/rsyncd.conf ${D}${sysconfdir}
48}
49
32BBCLASSEXTEND = "native" 50BBCLASSEXTEND = "native"