Skip to contentSkip to conversation

packagegroup-core-tools-profile: exclude sysprof for non-gplv3 builds

PATCH New Christopher Larson 1 participant 2 messages Nov 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 packagegroup-core-tools-profile: exclude sysprof for non-gplv3 builds

From: Christopher Larson <[email protected]>

This recipe is gplv3, so exclude it when it's incompatible.

---
 recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend
recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend new file +3 -0
new file mode 100644
index 00000000..d93feb0b
@@ -0,0 +1,3 @@
+inherit license
+
+PROFILE_TOOLS_X_remove = "${@incompatible_license_contains('GPL-3.0', 'sysprof', '', d)}"
Signature · 1 line
2.11.1
#1 lore raw

PATCH 2/2 rsync: update to latest gplv2 git version + fixes

From: Christopher Larson <[email protected]>

This fixes some issues with the gplv2 version that we ran into at Mentor.

---
 ...oss-compiling-tell-the-user-to-run-mkroun.patch |  71 +++++++++++
 ...-creation-of-rounding.h-to-use-a-set-of-c.patch | 142 +++++++++++++++++++++
 .../0003-Renamed-mkrounding.c-to-rounding.c.patch  | 104 +++++++++++++++
 .../0004-Improved-the-manpage-install-rules.patch  |  31 +++++
 recipes-devtools/rsync/rsync-2.6.9/addrinfo.h      | 115 +++++++++++++++++
 .../rsync-2.6.9/force-protocol-version-29.patch    |  12 ++
 recipes-devtools/rsync/rsync.inc                   |  20 ---
 recipes-devtools/rsync/rsync_2.6.9+git.bb          |  47 +++++++
 recipes-devtools/rsync/rsync_2.6.9.bb              |  16 ---
 9 files changed, 522 insertions(+), 36 deletions(-)
 create mode 100644 recipes-devtools/rsync/rsync-2.6.9/0001-If-we-re-cross-compiling-tell-the-user-to-run-mkroun.patch
 create mode 100644 recipes-devtools/rsync/rsync-2.6.9/0002-Changed-the-creation-of-rounding.h-to-use-a-set-of-c.patch
 create mode 100644 recipes-devtools/rsync/rsync-2.6.9/0003-Renamed-mkrounding.c-to-rounding.c.patch
 create mode 100644 recipes-devtools/rsync/rsync-2.6.9/0004-Improved-the-manpage-install-rules.patch
 create mode 100644 recipes-devtools/rsync/rsync-2.6.9/addrinfo.h
 create mode 100644 recipes-devtools/rsync/rsync-2.6.9/force-protocol-version-29.patch
 delete mode 100644 recipes-devtools/rsync/rsync.inc
 create mode 100644 recipes-devtools/rsync/rsync_2.6.9+git.bb
 delete mode 100644 recipes-devtools/rsync/rsync_2.6.9.bb
recipes-devtools/rsync/rsync-2.6.9/0001-If-we-re-cross-compiling-tell-the-user-to-run-mkroun.patch new file +71 -0
new file mode 100644
index 00000000..1542f193
@@ -0,0 +1,71 @@
+From 32da44bde46b8b78b25d37a172e7a57257ca5b8b Mon Sep 17 00:00:00 2001
+From: Wayne Davison <[email protected]>
+Date: Tue, 1 Jan 2008 08:59:26 -0800
+Subject: [PATCH 1/4] If we're cross-compiling, tell the user to run
+ mkrounding on the target machine to build the
+ rounding.h file. (cherry picked from commit
+ f859d3ded6285c499898540ca4fb16f1e1a7d26b)
+
+Conflicts:
+
+	NEWS
+	configure.in
+---
+ Makefile.in  |    9 ++++++++-
+ NEWS         |    6 ++++++
+ configure.in |    2 ++
+ 3 files changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e9bd2c1..c2f779f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -77,7 +77,14 @@ $(OBJS): $(HEADERS)
+ flist.o: rounding.h
+ 
+ rounding.h: mkrounding$(EXEEXT)
+-	./mkrounding$(EXEEXT) >rounding.h
++	@if test x@cross_compiling@ = xno; then \
++	    ./mkrounding$(EXEEXT) >rounding.h; \
++	else \
++	    echo "Copy the mkrounding$(EXEEXT) command to the target machine and run it like this:"; \
++	    echo "    ./mkrounding$(EXEEXT) >rounding.h"; \
++	    echo "Then copy the resulting rounding.h file to this build machine and rerun \"make\"."; \
++	    exit 1; \
++	fi
+ 
+ mkrounding$(EXEEXT): mkrounding.c rsync.h
+ 	@sed '1,/^struct file_struct/d; /^}/,$$d' <$(srcdir)/rsync.h >mkrounding.h
+diff --git a/NEWS b/NEWS
+index 9d23af0..bf6067e 100644
+--- a/NEWS
++++ b/NEWS
+@@ -4,6 +4,12 @@ Changes since 2.6.9:
+ 
+   BUG FIXES:
+ 
++    - If a file's data arrived successfully on the receiving side but the
++      rename of the tempory file to the destination file failed AND the
++      --remove-souce-files (or the deprecated --remove-sent-files) option
++      was specified, rsync no longer erroneously removes the associated
++      source file.
++
+     - Fixed the output of -ii when combined with one of the --*-dest options:
+       it now itemizes all the items, not just the changed ones.
+ 
+diff --git a/configure.in b/configure.in
+index 890a76b..aee2693 100644
+--- a/configure.in
++++ b/configure.in
+@@ -805,6 +805,8 @@ AC_SUBST(OBJ_SAVE)
+ AC_SUBST(OBJ_RESTORE)
+ AC_SUBST(CC_SHOBJ_FLAG)
+ AC_SUBST(BUILD_POPT)
++AC_SUBST(cross_compiling)
++
+ 
+ AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
+ AC_OUTPUT
+-- 
+1.7.9.5
+
recipes-devtools/rsync/rsync-2.6.9/0002-Changed-the-creation-of-rounding.h-to-use-a-set-of-c.patch new file +142 -0

142 lines not on this page · raw message

recipes-devtools/rsync/rsync-2.6.9/0003-Renamed-mkrounding.c-to-rounding.c.patch new file +104 -0

104 lines not on this page · raw message

recipes-devtools/rsync/rsync-2.6.9/0004-Improved-the-manpage-install-rules.patch new file +31 -0
new file mode 100644
index 00000000..83163713
@@ -0,0 +1,31 @@
+From ae41600a129cc0ada5ce33b1c5c1afc8c3c9cb63 Mon Sep 17 00:00:00 2001
+From: Wayne Davison <[email protected]>
+Date: Fri, 9 Nov 2007 18:12:40 +0000
+Subject: [PATCH 4/4] Improved the manpage install rules. (cherry picked from
+ commit c8dccf8fb4949ad8f2c25f86808b517a5b30faf9)
+
+Conflicts:
+
+	Makefile.in
+---
+ Makefile.in |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8b5e2f1..de37ddc 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -63,8 +63,8 @@ install: all
+ 	${INSTALLCMD} ${INSTALL_STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir}
+ 	-mkdir -p ${DESTDIR}${mandir}/man1
+ 	-mkdir -p ${DESTDIR}${mandir}/man5
+-	${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1
+-	${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5
++	if test -f $(srcdir)/rsync.1; then ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1; fi
++	if test -f $(srcdir)/rsyncd.conf.5; then ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5; fi
+ 
+ install-strip:
+ 	$(MAKE) INSTALL_STRIP='-s' install
+-- 
+1.7.9.5
+
recipes-devtools/rsync/rsync-2.6.9/addrinfo.h new file +115 -0

115 lines not on this page · raw message

recipes-devtools/rsync/rsync-2.6.9/force-protocol-version-29.patch new file +12 -0
new file mode 100644
index 00000000..ec198748
@@ -0,0 +1,12 @@
+diff -Naur old/rsync.h new/rsync.h
+--- old/rsync.h	2014-04-08 18:21:34.000000000 +1100
++++ new/rsync.h	2014-04-15 20:28:02.000000000 +1100
+@@ -82,7 +82,7 @@
+ 			     == ((unsigned)(b2) & (unsigned)(mask)))
+ 
+ /* update this if you make incompatible changes */
+-#define PROTOCOL_VERSION 30
++#define PROTOCOL_VERSION 29
+ 
+ /* We refuse to interoperate with versions that are not in this range.
+  * Note that we assume we'll work with later versions: the onus is on
recipes-devtools/rsync/rsync.inc deleted +0 -20
deleted file mode 100644
index 26c023af..00000000
@@ -1,20 +0,0 @@
-SUMMARY = "File synchronization tool"
-HOMEPAGE = "http://rsync.samba.org/"
-BUGTRACKER = "http://rsync.samba.org/bugzilla.html"
-SECTION = "console/network"
-
-DEPENDS = "popt"
-
-SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \
-           file://rsyncd.conf"
-
-inherit autotools
-
-do_install_append() {
-	install -d ${D}${sysconfdir}
-	install -m 0644 ${WORKDIR}/rsyncd.conf ${D}${sysconfdir}
-}
-
-EXTRA_OEMAKE='STRIP=""'
-
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
recipes-devtools/rsync/rsync_2.6.9+git.bb new file +47 -0

47 lines not on this page · raw message

recipes-devtools/rsync/rsync_2.6.9.bb deleted +0 -16
deleted file mode 100644
index 5c6c9d9a..00000000
@@ -1,16 +0,0 @@
-require rsync.inc
-
-SRC_URI += "file://rsync-2.6.9-fname-obo.patch \
-            file://0001-Make-it-build-with-compile-time-hardening-enabled.patch \
-            file://rsyncd.conf \
-"
-
-SRC_URI[md5sum] = "996d8d8831dbca17910094e56dcb5942"
-SRC_URI[sha256sum] = "ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6d5a9d4c4d3af25cd68fd83e8a8cb09c"
-
-PR = "r4"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
Signature · 1 line
2.11.1