non-GPLv3 fixes

PATCH In review Saul Wold 2 participants 5 messages Jan 5, 2012 – Jan 9, 2012

lore

Share & tools

lore

Saul Wold

author

2012-01-05 18:46 UTC #0 lore raw

cover non-GPLv3 fixes

Richard,

Better commit messages.

These fixes are for the non-GPLv3 build

Sau!

The following changes since commit 563828bad19a242bba9ce3db461bb5807037dfdf:

multilib: Abstract class extension code into classextend.py (2012-01-05 12:36:08 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix

Saul Wold (2):
util-linux: Update patch for non-GPLv3
gnutls: remove gettext patch for non-GPLv3

 .../util-linux-2.20.1/remove-lscpu.patch           |   94 +------------------
 meta/recipes-support/gnutls/gnutls_2.12.14.bb      |   13 ++-
 2 files changed, 15 insertions(+), 92 deletions(-)

Signature · 1 line

1.7.6.4

Saul Wold

author

2012-01-05 18:46 UTC #1 lore raw

PATCH 1/2 util-linux: Update patch for non-GPLv3

Rebase the disable-lscpu patch for the updated source base, we only need to modify Makefile.am, since automake will regenerate the Makefile.in.

Signed-off-by Saul Wold <[email protected]>

---
 .../util-linux-2.20.1/remove-lscpu.patch           |   94 +------------------
 1 files changed, 5 insertions(+), 89 deletions(-)

meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch +5 ~~-89~~

index afa50f4..434e28d 100644
@@ -6,104 +6,20 @@ Take out lscpu stuff from the code
 Saul Wold <[email protected]>
 Nitin A Kamble <[email protected]>
 
-Index: util-linux-2.19.1/sys-utils/Makefile.am
+Index: util-linux-2.20.1/sys-utils/Makefile.am
 ===================================================================
---- util-linux-2.19.1.orig/sys-utils/Makefile.am	2011-04-05 03:43:02.000000000 -0700
-+++ util-linux-2.19.1/sys-utils/Makefile.am	2011-06-29 12:08:24.187440334 -0700
-@@ -17,12 +17,6 @@
+--- util-linux-2.20.1.orig/sys-utils/Makefile.am
++++ util-linux-2.20.1/sys-utils/Makefile.am
+@@ -17,12 +17,6 @@ usrsbin_exec_PROGRAMS += ldattach tunelp
  dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
  		ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
  
 -if HAVE_CPU_SET_T
 -usrbin_exec_PROGRAMS += lscpu
--lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
+-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c $(top_srcdir)/lib/strutils.c
 -dist_man_MANS += lscpu.1
 -endif
 -
  endif
  
  cytune_SOURCES = cytune.c cyclades.h
-Index: util-linux-2.19.1/sys-utils/Makefile.in
-===================================================================
---- util-linux-2.19.1.orig/sys-utils/Makefile.in	2011-05-02 02:49:19.000000000 -0700
-+++ util-linux-2.19.1/sys-utils/Makefile.in	2011-06-29 12:10:47.647440371 -0700
-@@ -51,8 +51,6 @@
- @LINUX_TRUE@am__append_5 = dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
- @LINUX_TRUE@		ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
- 
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_6 = lscpu
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_7 = lscpu.1
- @BUILD_FALLOCATE_TRUE@am__append_8 = fallocate
- @BUILD_FALLOCATE_TRUE@am__append_9 = fallocate.1
- @BUILD_PIVOT_ROOT_TRUE@am__append_10 = pivot_root
-@@ -98,7 +96,6 @@
- @BUILD_PIVOT_ROOT_TRUE@am__EXEEXT_4 = pivot_root$(EXEEXT)
- @BUILD_SWITCH_ROOT_TRUE@am__EXEEXT_5 = switch_root$(EXEEXT)
- @LINUX_TRUE@am__EXEEXT_6 = cytune$(EXEEXT) setarch$(EXEEXT)
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__EXEEXT_7 = lscpu$(EXEEXT)
- @BUILD_FALLOCATE_TRUE@am__EXEEXT_8 = fallocate$(EXEEXT)
- @BUILD_UNSHARE_TRUE@am__EXEEXT_9 = unshare$(EXEEXT)
- @LINUX_TRUE@am__EXEEXT_10 = ldattach$(EXEEXT) tunelp$(EXEEXT) \
-@@ -146,11 +143,6 @@
- ldattach_SOURCES = ldattach.c
- ldattach_OBJECTS = ldattach.$(OBJEXT)
- ldattach_LDADD = $(LDADD)
--am__lscpu_SOURCES_DIST = lscpu.c $(top_srcdir)/lib/cpuset.c
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am_lscpu_OBJECTS = lscpu.$(OBJEXT) \
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@	cpuset.$(OBJEXT)
--lscpu_OBJECTS = $(am_lscpu_OBJECTS)
--lscpu_LDADD = $(LDADD)
- pivot_root_SOURCES = pivot_root.c
- pivot_root_OBJECTS = pivot_root.$(OBJEXT)
- pivot_root_LDADD = $(LDADD)
-@@ -206,13 +198,13 @@
- am__v_GEN_0 = @echo "  GEN   " $@;
- SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
- 	$(fallocate_SOURCES) flock.c fsfreeze.c $(fstrim_SOURCES) \
--	ipcmk.c ipcrm.c ipcs.c ldattach.c $(lscpu_SOURCES) \
-+	ipcmk.c ipcrm.c ipcs.c ldattach.c \
- 	pivot_root.c readprofile.c renice.c $(rtcwake_SOURCES) \
- 	setarch.c setsid.c switch_root.c $(tunelp_SOURCES) unshare.c
- DIST_SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
- 	$(am__fallocate_SOURCES_DIST) flock.c fsfreeze.c \
- 	$(fstrim_SOURCES) ipcmk.c ipcrm.c ipcs.c ldattach.c \
--	$(am__lscpu_SOURCES_DIST) pivot_root.c readprofile.c renice.c \
-+	pivot_root.c readprofile.c renice.c \
- 	$(rtcwake_SOURCES) setarch.c setsid.c switch_root.c \
- 	$(tunelp_SOURCES) unshare.c
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -242,7 +234,7 @@
- MANS = $(dist_man_MANS) $(man_MANS)
- am__dist_noinst_DATA_DIST = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 \
- 	setsid.1 readprofile.1 dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
--	ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 lscpu.1 \
-+	ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 \
- 	fallocate.1 pivot_root.8 switch_root.8 unshare.1 arch.1
- DATA = $(dist_noinst_DATA)
- ETAGS = etags
-@@ -438,7 +430,6 @@
- 	readprofile.1 $(am__append_5) $(am__append_7) $(am__append_9) \
- 	$(am__append_11) $(am__append_13) $(am__append_15) \
- 	$(am__append_17)
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
- cytune_SOURCES = cytune.c cyclades.h
- tunelp_SOURCES = tunelp.c lp.h
- fstrim_SOURCES = fstrim.c $(top_srcdir)/lib/strutils.c
-@@ -693,9 +684,6 @@
- ldattach$(EXEEXT): $(ldattach_OBJECTS) $(ldattach_DEPENDENCIES) 
- 	@rm -f ldattach$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(ldattach_OBJECTS) $(ldattach_LDADD) $(LIBS)
--lscpu$(EXEEXT): $(lscpu_OBJECTS) $(lscpu_DEPENDENCIES) 
--	@rm -f lscpu$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(lscpu_OBJECTS) $(lscpu_LDADD) $(LIBS)
- pivot_root$(EXEEXT): $(pivot_root_OBJECTS) $(pivot_root_DEPENDENCIES) 
- 	@rm -f pivot_root$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(pivot_root_OBJECTS) $(pivot_root_LDADD) $(LIBS)
-@@ -743,7 +731,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcrm.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldattach.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lscpu.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pivot_root.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readprofile.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/renice.Po@am__quote@

Signature · 1 line

1.7.6.4

Saul Wold

author

2012-01-05 18:46 UTC #2 lore raw

PATCH 2/2 gnutls: remove gettext patch for non-GPLv3

In reply to Saul Wold

GPLv2 version of gnutls does not need the gettext 0.18 patch since it still uses the over version of gettext that is also GPLv2.

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-support/gnutls/gnutls_2.12.14.bb |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

meta/recipes-support/gnutls/gnutls_2.12.14.bb +10 -3

index 045ba69..21fd187 100644
@@ -1,10 +1,17 @@
 require gnutls.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 SRC_URI += "file://gnutls-openssl.patch \
-            file://configure-fix.patch \
-            file://fix-gettext-version.patch"
+            file://configure-fix.patch"
+
+python() {
+    if not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):
+        # if GPLv3 add patch
+        src_uri = (d.getVar("SRC_URI", False) or "").split()
+        src_uri.append("file://fix-gettext-version.patch")
+        d.setVar("SRC_URI", " ".join(src_uri))
+}
 
 SRC_URI[md5sum] = "555687a7ffefba0bd9de1e71cb61402c"
 SRC_URI[sha256sum] = "5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3"

Signature · 1 line

1.7.6.4

Denys Dmytriyenko

2012-01-05 20:41 UTC #3 lore raw

Re: [PATCH 2/2] gnutls: remove gettext patch for non-GPLv3

Quoted 2 lines · Saul Wold

GPLv2 version of gnutls does not need the gettext 0.18 patch since it still uses the over version of gettext that is also

"uses the older version", I guess, not "over"...

Thanks for the patch! Have you looked at gnutls-extras by any chance? Do you have any details about its GPLv2/v3 licensing?

Signature · 1 line

Denys

Quoted 40 lines

GPLv2.

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-support/gnutls/gnutls_2.12.14.bb |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

meta/recipes-support/gnutls/gnutls_2.12.14.bb +10 -3

index 045ba69..21fd187 100644
@@ -1,10 +1,17 @@
 require gnutls.inc
 
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 SRC_URI += "file://gnutls-openssl.patch \
-            file://configure-fix.patch \
-            file://fix-gettext-version.patch"
+            file://configure-fix.patch"
+
+python() {
+    if not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):
+        # if GPLv3 add patch
+        src_uri = (d.getVar("SRC_URI", False) or "").split()
+        src_uri.append("file://fix-gettext-version.patch")
+        d.setVar("SRC_URI", " ".join(src_uri))
+}
 
 SRC_URI[md5sum] = "555687a7ffefba0bd9de1e71cb61402c"
 SRC_URI[sha256sum] = "5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3"

Signature · 7 lines

1.7.6.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Saul Wold

author

2012-01-09 05:38 UTC #4 lore raw

Re: [PATCH 2/2] gnutls: remove gettext patch for non-GPLv3

Quoted 9 lines · Denys Dmytriyenko

Quoted 2 lines · Saul Wold
GPLv2 version of gnutls does not need the gettext 0.18 patch since it still uses the over version of gettext that is also
"uses the older version", I guess, not "over"...
Thanks for the patch! Have you looked at gnutls-extras by any chance? Do you have any details about its GPLv2/v3 licensing?

I will look into it again this week.

Sau!