Non-GPLv3 Changes & a dependency Fix

PATCH Applied Saul Wold 5 participants 13 messages Mar 17, 2011 – Mar 21, 2011

lore

Share & tools

lore

Saul Wold

author

2011-03-17 09:58 UTC #0 lore raw

cover Non-GPLv3 Changes & a dependency Fix

From: Saul Wold <[email protected]>

Richard,

This set of changes enables both poky-image-minimal and poky-image-basic to build non-gplv3 core image. These are bound for bernard

There is also a fix for the gnome-vfs dependency on ACL. This is a potential build stopper and should be considered for bernard

Sau!

Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: sgw/non-gplv3
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/non-gplv3

Thanks,
Saul Wold <[email protected]>
---

Saul Wold (7):
util-linux: Setup for GPLv2 Recipe
extended tasks: move binutils from basic to lsb
poky-image-basic: remove POKY_BASE_INSTALL poky.conf: add additional Libraries to the LGPLv2 Whitelist poky.conf: remove gnome-common from WHITELIST_GPLV3
gettext: Upgrade GPLv2 version to 0.16.1
gnome-vfs: add DEPENDS for acl

 meta/conf/distro/poky.conf                         |    4 +-
 .../gettext/gettext-0.14.1/gettext-vpath.patch     |   15 -
 .../gettext/gettext-0.14.1/linklib_from_0.17.patch | 1135 --------------------
 .../disable_java.patch                             |   19 +-
 .../gettext-0.16.1/fix_aclocal_version.patch       |  107 ++
 .../gettext-0.16.1/fix_gnu_source_circular.patch   |  345 ++++++
 .../fixchicken.patch                               |    0
 .../getline.m4.patch                               |    0
 .../gettext-autoconf-lib-link-no-L.patch           |    4 +
 .../gettext-error_print_progname.patch             |    0
 .../gettext/gettext-0.16.1/gettext-vpath.patch     |   17 +
 .../gettext-0.16.1/hardcode_macro_version.patch    |   48 +
 .../gettext/gettext-0.16.1/linklib_from_0.17.patch |  717 ++++++++++++
 .../{gettext_0.14.1.bb => gettext_0.16.1.bb}       |   20 +-
 meta/recipes-core/util-linux/util-linux.inc        |    5 +-
 meta/recipes-core/util-linux/util-linux_2.17.2.bb  |    9 +-
 meta/recipes-core/util-linux/util-linux_gplv2.bb   |   24 +
 meta/recipes-extended/images/poky-image-basic.bb   |    4 +-
 meta/recipes-extended/tasks/task-poky-basic.bb     |    2 -
 meta/recipes-extended/tasks/task-poky-lsb.bb       |    3 +-
 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb       |    2 +-
 21 files changed, 1298 insertions(+), 1182 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-0.14.1/gettext-vpath.patch
 delete mode 100644 meta/recipes-core/gettext/gettext-0.14.1/linklib_from_0.17.patch
 rename meta/recipes-core/gettext/{gettext-0.14.1 => gettext-0.16.1}/disable_java.patch (53%)
 create mode 100644 meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
 create mode 100644 meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
 rename meta/recipes-core/gettext/{gettext-0.14.1 => gettext-0.16.1}/fixchicken.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.14.1 => gettext-0.16.1}/getline.m4.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.14.1 => gettext-0.16.1}/gettext-autoconf-lib-link-no-L.patch (88%)
 rename meta/recipes-core/gettext/{gettext-0.14.1 => gettext-0.16.1}/gettext-error_print_progname.patch (100%)
 create mode 100644 meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
 create mode 100644 meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
 create mode 100644 meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
 rename meta/recipes-core/gettext/{gettext_0.14.1.bb => gettext_0.16.1.bb} (74%)
 create mode 100644 meta/recipes-core/util-linux/util-linux_gplv2.bb

Saul Wold

author

2011-03-17 09:58 UTC #1 lore raw

PATCH 1/7 util-linux: Setup for GPLv2 Recipe

From: Saul Wold <[email protected]>

* add task to remove the GPLv3 lscpu code
* Add patch to remove the reference to lscpu in Makfiles

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

---
 meta/recipes-core/util-linux/util-linux.inc       |    5 +---
 meta/recipes-core/util-linux/util-linux_2.17.2.bb |    9 +++++++-
 meta/recipes-core/util-linux/util-linux_gplv2.bb  |   24 +++++++++++++++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-core/util-linux/util-linux_gplv2.bb

meta/recipes-core/util-linux/util-linux.inc +1 -4

index 6f8bcb3..446c8e4 100644
@@ -5,9 +5,7 @@ disk partitioning, kernel message management, filesystem creation, and system lo
 
 SECTION = "base"
 
-# note that `lscpu' is under GPLv3+
 LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
-LICENSE_util-linux-lscpu = "GPLv3+"
 
 LIC_FILES_CHKSUM = "file://README.licensing;md5=1530e36fe1304d4535513de90a290df9 \
                     file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \

@@ -30,7 +28,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${MAJOR_VERSION}/u
 PACKAGES =+ "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff \
                     util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile \
                     util-linux-libblkid util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
-                    util-linux-lscpu util-linux-uuidgen \
+                    util-linux-uuidgen \
                    "
 
 S = "${WORKDIR}/util-linux-ng-${PV}"

@@ -49,7 +47,6 @@ FILES_util-linux-losetup = "${base_sbindir}/losetup.${PN}"
 FILES_util-linux-mount = "${base_bindir}/mount.${PN}"
 FILES_util-linux-umount = "${base_bindir}/umount.${PN}"
 FILES_util-linux-readprofile = "${base_sbindir}/readprofile"
-FILES_util-linux-lscpu = "${bindir}/lscpu"
 FILES_util-linux-uuidgen = "${bindir}/uuidgen"
 
 FILES_util-linux-libblkid = "${libdir}/libblkid.so.*"

meta/recipes-core/util-linux/util-linux_2.17.2.bb +8 -1

index 190a9e3..b1f5b13 100644
@@ -1,6 +1,9 @@
 MAJOR_VERSION = "2.17"
 require util-linux.inc
-PR = "r6"
+PR = "r7"
+
+# note that `lscpu' is under GPLv3+
+LICENSE_util-linux-lscpu = "GPLv3+"
 
 SRC_URI += "file://uclibc-compile.patch \
 	          file://util-linux-ng-replace-siginterrupt.patch \

@@ -9,6 +12,10 @@ SRC_URI += "file://uclibc-compile.patch \
 SRC_URI[md5sum] = "4635725a3eef1c57090bac8ea5e082e6"
 SRC_URI[sha256sum] = "c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f"
 
+PACKAGES =+ " util-linux-lscp "
+
+FILES_util-linux-lscpu = "${bindir}/lscpu"
+
 # fallocate is glibc 2.10, fallocate64 is glibc 2.11
 # we need to disable it for older versions
 EXTRA_OECONF += "ac_cv_func_fallocate=no"

meta/recipes-core/util-linux/util-linux_gplv2.bb new file +24 -0

new file mode 100644
index 0000000..c711fac
@@ -0,0 +1,24 @@
+MAJOR_VERSION = "2.17"
+PV = "2.17.1"
+
+require util-linux.inc
+PR = "r1"
+
+SRC_URI += "file://uclibc-compile.patch \
+	          file://util-linux-ng-replace-siginterrupt.patch \
+                  file://util-linux-ng-2.16-mount_lock_path.patch \
+                  file://remove-lscpu.patch"
+
+do_remove_lscpu() {
+	rm -f sys-utils/lscpu.c
+	rm -f sys-utils/lscpu.1
+}
+addtask remove_lscpu before do_configure after do_patch
+
+SRC_URI[md5sum] = "4635725a3eef1c57090bac8ea5e082e6"
+SRC_URI[sha256sum] = "c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f"
+
+# fallocate is glibc 2.10, fallocate64 is glibc 2.11
+# we need to disable it for older versions
+EXTRA_OECONF += "ac_cv_func_fallocate=no"
+EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group"

Signature · 1 line

1.7.1.1

Saul Wold

author

2011-03-17 09:58 UTC #2 lore raw

PATCH 2/7 extended tasks: move binutils from basic to lsb

In reply to Saul Wold

From: Saul Wold <[email protected]>

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

---
 meta/recipes-extended/tasks/task-poky-basic.bb |    2 --
 meta/recipes-extended/tasks/task-poky-lsb.bb   |    3 +--
 2 files changed, 1 insertions(+), 4 deletions(-)

meta/recipes-extended/tasks/task-poky-basic.bb +0 -2

index 3d313f0..80eac0f 100644
@@ -99,7 +99,6 @@ RDEPENDS_task-poky-basic-extended = "\
     module-init-tools \
     openssl \
     "
-#    openssh
 
 RDEPENDS_task-poky-dev-utils = "\
     byacc \

@@ -107,7 +106,6 @@ RDEPENDS_task-poky-dev-utils = "\
     m4 \
     make \
     patch \
-    binutils \
     "
 
 RDEPENDS_task-poky-initscripts = "\

meta/recipes-extended/tasks/task-poky-lsb.bb +1 -2

index 5e3397e..7b3c41a 100644
@@ -52,9 +52,8 @@ RDEPENDS_task-poky-lsb = "\
     task-poky-lsb-command-add \
     "
 
-#
-# GPLv2 Should List
 RDEPENDS_task-poky-sys-extended = "\
+    binutils \
     chkconfig \
     curl \
     dhcp-client \

Signature · 1 line

1.7.1.1

Saul Wold

author

2011-03-17 09:58 UTC #3 lore raw

PATCH 3/7 poky-image-basic: remove POKY_BASE_INSTALL

In reply to Saul Wold

From: Saul Wold <[email protected]>

Removing POKY_BASE_INSTALL and replacing it with task-poky-boot, effectively removes task-poky-extended which was pulling unwanted recipes.

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

---
 meta/recipes-extended/images/poky-image-basic.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

meta/recipes-extended/images/poky-image-basic.bb +3 -1

index 7e4596e..76d5dc2 100644
@@ -1,8 +1,10 @@
 IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
 
 IMAGE_INSTALL = "\
-    ${POKY_BASE_INSTALL} \
+    task-poky-boot \
     task-poky-basic \
     "
 
+#    ${POKY_BASE_INSTALL} 
+
 inherit poky-image

Signature · 1 line

1.7.1.1

Saul Wold

author

2011-03-17 09:58 UTC #4 lore raw

PATCH 4/7 poky.conf: add additional Libraries to the LGPLv2 Whitelist

In reply to Saul Wold

From: Saul Wold <[email protected]>

The ligcc and gcc-runtime both are LGPLv2 libraries although they are part of the large GCC GPLv3 code. There is clearly called out exceptions for these libraries.

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

---
 meta/conf/distro/poky.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/conf/distro/poky.conf +1 -1

index 71e40de..eee12b7 100644
@@ -131,7 +131,7 @@ EXTRAOPKGCONFIG = "poky-feed-config-opkg"
 # directly part of the distribution. 
 HOSTTOOLS_WHITELIST_GPLv3 ?= ""
 WHITELIST_GPLv3 ?= "less gnome-common"
-LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn" 
+LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime" 
 
 # This is a list of packages that require a commercial license to ship
 # product. If shipped as part of an image these packages may have

Signature · 1 line

1.7.1.1

Saul Wold

author

2011-03-17 09:58 UTC #5 lore raw

PATCH 5/7 poky.conf: remove gnome-common from WHITELIST_GPLV3

In reply to Saul Wold

From: Saul Wold <[email protected]>

This was due to task-poky-extended pulling in qemu-config for non-GPLv3 poky-image-basic

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

---
 meta/conf/distro/poky.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/conf/distro/poky.conf +1 -1

index eee12b7..76620f9 100644
@@ -130,7 +130,7 @@ EXTRAOPKGCONFIG = "poky-feed-config-opkg"
 # This is a list of packages that are used by poky to build the distribution, they are not
 # directly part of the distribution. 
 HOSTTOOLS_WHITELIST_GPLv3 ?= ""
-WHITELIST_GPLv3 ?= "less gnome-common"
+WHITELIST_GPLv3 ?= "less"
 LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime" 
 
 # This is a list of packages that require a commercial license to ship

Signature · 1 line

1.7.1.1

Saul Wold

author

2011-03-17 09:58 UTC #6 lore raw

PATCH 6/7 gettext: Upgrade GPLv2 version to 0.16.1

In reply to Saul Wold

From: Saul Wold <[email protected]>

This adds a couple of new patches for handling various autoconf and autolocal issues. It also hardcodes a GETTEXT_MACRO_VERSION to 0.17 to match the native gettext.

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

---
 .../gettext/gettext-0.14.1/gettext-vpath.patch     |   15 -
 .../gettext/gettext-0.14.1/linklib_from_0.17.patch | 1135 --------------------
 .../disable_java.patch                             |   19 +-
 .../gettext-0.16.1/fix_aclocal_version.patch       |  107 ++
 .../gettext-0.16.1/fix_gnu_source_circular.patch   |  345 ++++++
 .../fixchicken.patch                               |    0
 .../getline.m4.patch                               |    0
 .../gettext-autoconf-lib-link-no-L.patch           |    4 +
 .../gettext-error_print_progname.patch             |    0
 .../gettext/gettext-0.16.1/gettext-vpath.patch     |   17 +
 .../gettext-0.16.1/hardcode_macro_version.patch    |   48 +
 .../gettext/gettext-0.16.1/linklib_from_0.17.patch |  717 ++++++++++++
 .../{gettext_0.14.1.bb => gettext_0.16.1.bb}       |   20 +-
 13 files changed, 1258 insertions(+), 1169 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-0.14.1/gettext-vpath.patch
 delete mode 100644 meta/recipes-core/gettext/gettext-0.14.1/linklib_from_0.17.patch
 rename meta/recipes-core/gettext/{gettext-0.14.1 => gettext-0.16.1}/disable_java.patch (53%)
 create mode 100644 meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch
 create mode 100644 meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch
 rename meta/recipes-core/gettext/{gettext-0.14.1 => gettext-0.16.1}/fixchicken.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.14.1 => gettext-0.16.1}/getline.m4.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.14.1 => gettext-0.16.1}/gettext-autoconf-lib-link-no-L.patch (88%)
 rename meta/recipes-core/gettext/{gettext-0.14.1 => gettext-0.16.1}/gettext-error_print_progname.patch (100%)
 create mode 100644 meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch
 create mode 100644 meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch
 create mode 100644 meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch
 rename meta/recipes-core/gettext/{gettext_0.14.1.bb => gettext_0.16.1.bb} (74%)

meta/recipes-core/gettext/gettext-0.14.1/gettext-vpath.patch deleted +0 ~~-15~~

deleted file mode 100644
index e31243b..0000000
@@ -1,15 +0,0 @@
-# Pulled from OpenEmbedded
-# 
-# Commented by: Saul Wold <[email protected]>
-
---- gettext-0.14.1/gettext-runtime/intl/Makefile.in~	2004-04-09 13:23:40.000000000 +0100
-+++ gettext-0.14.1/gettext-runtime/intl/Makefile.in	2004-04-09 13:22:05.000000000 +0100
-@@ -24,7 +24,7 @@
- srcdir = $(top_srcdir)/../gettext-runtime/intl
- top_srcdir = /var/tmp/oe-tmp.pb/base/gettext-0.14.1-r0/gettext-0.14.1/gettext-tools
- top_builddir = ..
--VPATH = $(srcdir)
-+#VPATH = $(srcdir)
- 
- prefix = /usr
- exec_prefix = /usr

meta/recipes-core/gettext/gettext-0.14.1/linklib_from_0.17.patch deleted +0 ~~-1135~~

1,135 lines not on this page · raw message

meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch renamed from meta/recipes-core/gettext/gettext-0.14.1/disable_java.patch +9 ~~-10~~

similarity index 53%
rename from meta/recipes-core/gettext/gettext-0.14.1/disable_java.patch
rename to meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch
index f1ae816..cf7dc55 100644
@@ -2,31 +2,30 @@
 # 
 # Commented by: Saul Wold <[email protected]>
 
-Index: gettext-0.14.1/gettext-tools/configure.ac
+Index: gettext-0.16.1/gettext-tools/configure.ac
 ===================================================================
---- gettext-0.14.1.orig/gettext-tools/configure.ac	2004-01-16 10:49:06.000000000 +0000
-+++ gettext-0.14.1/gettext-tools/configure.ac	2007-11-14 21:43:39.000000000 +0000
-@@ -37,28 +37,16 @@
- AC_PROG_YACC
+--- gettext-0.16.1.orig/gettext-tools/configure.ac	2006-11-27 09:02:01.000000000 -0800
++++ gettext-0.16.1/gettext-tools/configure.ac	2011-03-16 16:55:36.111396557 -0700
+@@ -36,27 +36,15 @@
+ gt_JAVA_CHOICE
  
  gt_GCJ
--if test -n "$HAVE_GCJ"; then
+-if test -n "$HAVE_GCJ" && test "$JAVA_CHOICE" = yes; then
 -  BUILDJAVAEXE=yes
 -else
    BUILDJAVAEXE=no
 -fi
  AC_SUBST(BUILDJAVAEXE)
  
- gt_JAVACOMP
+ gt_JAVAEXEC
+ gt_JAVACOMP([1.3])
  AC_CHECK_PROG(JAR, jar, jar)
--if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
+-if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
 -  BUILDJAVA=yes
 -else
    BUILDJAVA=no
 -fi
  AC_SUBST(BUILDJAVA)
- 
- gt_JAVAEXEC
 -if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
 -  TESTJAVA=yes
 -else

meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch new file +107 -0

107 lines not on this page · raw message

meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch new file +345 -0

345 lines not on this page · raw message

meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch renamed from meta/recipes-core/gettext/gettext-0.14.1/fixchicken.patch +0 -0

similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.14.1/fixchicken.patch
rename to meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch

meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch renamed from meta/recipes-core/gettext/gettext-0.14.1/getline.m4.patch +0 -0

similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.14.1/getline.m4.patch
rename to meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch

meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch renamed from meta/recipes-core/gettext/gettext-0.14.1/gettext-autoconf-lib-link-no-L.patch +4 -0

similarity index 88%
rename from meta/recipes-core/gettext/gettext-0.14.1/gettext-autoconf-lib-link-no-L.patch
rename to meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch
index 2fe62c0..e8bb2f6 100644
@@ -1,3 +1,7 @@
+# Pulled from OpenEmbedded
+# 
+# Commented by: Saul Wold <[email protected]>
+
 --- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~	2009-04-17 15:12:30.000000000 -0700
 +++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4	2009-04-17 15:37:39.000000000 -0700
 @@ -267,6 +267,9 @@

meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch renamed from meta/recipes-core/gettext/gettext-0.14.1/gettext-error_print_progname.patch +0 -0

similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.14.1/gettext-error_print_progname.patch
rename to meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch

meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch new file +17 -0

new file mode 100644
index 0000000..62420b7
@@ -0,0 +1,17 @@
+# Pulled from OpenEmbedded
+# 
+# Commented by: Saul Wold <[email protected]>
+
+Index: gettext-0.16.1/gettext-runtime/intl/Makefile.in
+===================================================================
+--- gettext-0.16.1.orig/gettext-runtime/intl/Makefile.in	2006-11-27 09:02:00.000000000 -0800
++++ gettext-0.16.1/gettext-runtime/intl/Makefile.in	2011-03-16 16:04:49.175419930 -0700
+@@ -35,7 +35,7 @@
+ #    'make' does the wrong thing if GNU gettext was configured with
+ #    "./configure --srcdir=`pwd`", namely it gets confused by the .lo and .la
+ #    files it finds in srcdir = ../../gettext-runtime/intl.
+-VPATH = $(srcdir)
++#VPATH = $(srcdir)
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@

meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch new file +48 -0

48 lines not on this page · raw message

meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch new file +717 -0

717 lines not on this page · raw message

meta/recipes-core/gettext/gettext_0.16.1.bb renamed from meta/recipes-core/gettext/gettext_0.14.1.bb +11 -9

similarity index 74%
rename from meta/recipes-core/gettext/gettext_0.14.1.bb
rename to meta/recipes-core/gettext/gettext_0.16.1.bb
index 90756bc..754b0ad 100644
@@ -2,9 +2,9 @@ DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9ea3144f04c41cd2eada5d3f472e6ea5"
 
-PR = "r11"
+PR = "r3"
 DEPENDS = "virtual/libiconv"
 DEPENDS_virtclass-native = ""
 PROVIDES = "virtual/libintl"

@@ -12,24 +12,26 @@ PROVIDES_virtclass-native = ""
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
            file://gettext-vpath.patch \
-           file://fixchicken.patch \
            file://linklib_from_0.17.patch \
-           file://getline.m4.patch \
-           file://disable_java.patch"
+	   file://gettext-autoconf-lib-link-no-L.patch \
+           file://disable_java.patch \
+           file://fix_aclocal_version.patch \
+           file://fix_gnu_source_circular.patch \
+           file://hardcode_macro_version.patch \
+          "
 
-#	   file://gettext-autoconf-lib-link-no-L.patch
 
 SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch"
 SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch"
 
-SRC_URI[md5sum] = "78f4b862510beb2e5d43223dd610e77d"
-SRC_URI[sha256sum] = "41f20c469c7759acb34cfa7e0b3cac9096d59a58ad800e471f07424a8e7adbb7"
+SRC_URI[md5sum] = "3d9ad24301c6d6b17ec30704a13fe127"
+SRC_URI[sha256sum] = "0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d"
 
 PARALLEL_MAKE = ""
 
 inherit autotools
 
-EXTRA_OECONF += "--without-lisp --disable-csharp"
+EXTRA_OECONF += "--without-lisp --disable-csharp --disable-openmp"
 acpaths = '-I ${S}/autoconf-lib-link/m4/ \
            -I ${S}/gettext-runtime/m4 \
            -I ${S}/gettext-tools/m4'

Signature · 1 line

1.7.1.1

Saul Wold

author

2011-03-17 09:58 UTC #7 lore raw

PATCH 7/7 gnome-vfs: add DEPENDS for acl

In reply to Saul Wold

From: Saul Wold <[email protected]>

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

---
 meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-gnome/gnome/gnome-vfs_2.24.4.bb +1 -1

index 0c307da..8d4040d 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://daemon/vfs-daemon.c;endline=21;md5=5f2c61553fb16abb07fc9498ca03fe1f \
                     file://modules/cdda-cddb.h;endline=22;md5=20ed324ca64907c366ecd7f22b8e0c54"
 
-DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib"
+DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib acl"
 RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info"
 # Some legacy packages will require gnome-mime-data to be installed, but use of
 # it is deprecated.

Signature · 1 line

1.7.1.1

Richard Purdie

Applied

2011-03-17 17:48 UTC #8 lore raw

In reply to Saul Wold

Quoted 12 lines · Saul Wold

From: Saul Wold <[email protected]>
This set of changes enables both poky-image-minimal and poky-image-basic to build non-gplv3 core image. These are bound for bernard
There is also a fix for the gnome-vfs dependency on ACL. This is a potential build stopper and should be considered for bernard
Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: sgw/non-gplv3
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/non-gplv3

Quoted 7 lines

Thanks,
Saul Wold <[email protected]>
---
Saul Wold (7):
util-linux: Setup for GPLv2 Recipe

I don't like this patch at all, there are some typos in it and some other issues. Too risky for bernard for sure. I'm leaving it for now.

Quoted 5 lines

extended tasks: move binutils from basic to lsb
poky-image-basic: remove POKY_BASE_INSTALL poky.conf: add additional Libraries to the LGPLv2 Whitelist poky.conf: remove gnome-common from WHITELIST_GPLV3
gettext: Upgrade GPLv2 version to 0.16.1

I've merged these into OECore and Poky master. Not sure about bernard yet.

Quoted 1 line

gnome-vfs: add DEPENDS for acl

I merged a different fix for the gnome-vfs problem into everything including bernard.

Cheers,

Richard

Denys Dmytriyenko

2011-03-21 06:24 UTC #9 lore raw

Quoted 18 lines · Richard Purdie

Quoted 17 lines · Saul Wold
From: Saul Wold <[email protected]>
This set of changes enables both poky-image-minimal and poky-image-basic to build non-gplv3 core image. These are bound for bernard
There is also a fix for the gnome-vfs dependency on ACL. This is a potential build stopper and should be considered for bernard
Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: sgw/non-gplv3
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/non-gplv3
Thanks,
Saul Wold <[email protected]>
---

Quoted 5 lines

Quoted 2 lines
Saul Wold (7):
util-linux: Setup for GPLv2 Recipe
I don't like this patch at all, there are some typos in it and some other issues. Too risky for bernard for sure. I'm leaving it for now.

FYI, in Arago I had to repackage util-linux-ng source tarball w/o lscpu pieces to completely avoid GPLv3, instead of removing them on the fly... In case when said source tarball needs to be mirrored or distributed with the build.

And, BTW, there is one more little script under GPLv3 - tests/ts/lscpu/lscpu

Signature · 1 line

Denys

Kamble, Nitin A

2011-03-21 15:35 UTC #10 lore raw

Quoted 38 lines

-----Original Message-----
From: [email protected] [mailto:poky- [email protected]] On Behalf Of Denys Dmytriyenko
Sent: Sunday, March 20, 2011 11:24 PM
To: Patches and discussions about the oe-core layer
Cc: [email protected]
Subject: Re: [poky] [OE-core] [PATCH 0/7] Non-GPLv3 Changes & a dependency Fix
Quoted 4 lines · Richard Purdie
Quoted 3 lines · Saul Wold
From: Saul Wold <[email protected]>
This set of changes enables both poky-image-minimal and poky-image-
basic
Quoted 8 lines
Quoted 8 lines
to build non-gplv3 core image. These are bound for bernard
There is also a fix for the gnome-vfs dependency on ACL. This is a potential build stopper and should be considered for bernard
Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: sgw/non-gplv3
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-
contrib/log/?h=sgw/non-gplv3
Quoted 11 lines
Quoted 8 lines
Thanks,
Saul Wold <[email protected]>
---
Saul Wold (7):
util-linux: Setup for GPLv2 Recipe
I don't like this patch at all, there are some typos in it and some other issues. Too risky for bernard for sure. I'm leaving it for now.

Quoted 8 lines

FYI, in Arago I had to repackage util-linux-ng source tarball w/o lscpu pieces
to completely avoid GPLv3, instead of removing them on the fly... In case when
said source tarball needs to be mirrored or distributed with the build.
And, BTW, there is one more little script under GPLv3 - tests/ts/lscpu/lscpu

In the updated commit, all the lscpu files from tests directory also are removed.

+do_remove_lscpu() {
+ if [ "x${REMOVELSCPU}" = "xyes" ]; then
+ rm -f sys-utils/lscpu.c sys-utils/lscpu.1
+ rm -rf tests/ts/lscpu tests/expected/lscpu
+ fi
+}

Thank you,
Nitin

Quoted 7 lines

--
Denys
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky

Richard Purdie

2011-03-21 15:52 UTC #11 lore raw

In reply to Denys Dmytriyenko

Quoted 22 lines · Denys Dmytriyenko

Quoted 21 lines · Richard Purdie
Quoted 19 lines · Saul Wold
From: Saul Wold <[email protected]>
This set of changes enables both poky-image-minimal and poky-image-basic to build non-gplv3 core image. These are bound for bernard
There is also a fix for the gnome-vfs dependency on ACL. This is a potential build stopper and should be considered for bernard
Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: sgw/non-gplv3
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/non-gplv3
Thanks,
Saul Wold <[email protected]>
---
Saul Wold (7):
util-linux: Setup for GPLv2 Recipe

Quoted 6 lines

Quoted 2 lines
I don't like this patch at all, there are some typos in it and some other issues. Too risky for bernard for sure. I'm leaving it for now.
FYI, in Arago I had to repackage util-linux-ng source tarball w/o lscpu pieces to completely avoid GPLv3, instead of removing them on the fly... In case when said source tarball needs to be mirrored or distributed with the build.

The main point is to ensure the runtime is GPLv3 free. With those files removed, that is the case. If you share a mirror with some GPLv3 code in it, it has a very different effect licensing wise compared to v3 binaries on a system. I'm not a lawyer though and I'd be interested to know if you've heard a different interpretation of the license?

Quoted 1 line

And, BTW, there is one more little script under GPLv3 - tests/ts/lscpu/lscpu

As Nitin replied, I thought that was removed already?

Cheers,

Richard

Mark Hatle

2011-03-21 16:40 UTC #12 lore raw

Quoted 36 lines · Richard Purdie

Quoted 22 lines · Denys Dmytriyenko
Quoted 21 lines · Richard Purdie
Quoted 19 lines · Saul Wold
From: Saul Wold <[email protected]>
This set of changes enables both poky-image-minimal and poky-image-basic to build non-gplv3 core image. These are bound for bernard
There is also a fix for the gnome-vfs dependency on ACL. This is a potential build stopper and should be considered for bernard
Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: sgw/non-gplv3
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/non-gplv3
Thanks,
Saul Wold <[email protected]>
---
Saul Wold (7):
util-linux: Setup for GPLv2 Recipe
Quoted 6 lines
Quoted 2 lines
I don't like this patch at all, there are some typos in it and some other issues. Too risky for bernard for sure. I'm leaving it for now.
FYI, in Arago I had to repackage util-linux-ng source tarball w/o lscpu pieces to completely avoid GPLv3, instead of removing them on the fly... In case when said source tarball needs to be mirrored or distributed with the build.
The main point is to ensure the runtime is GPLv3 free. With those files removed, that is the case. If you share a mirror with some GPLv3 code in it, it has a very different effect licensing wise compared to v3 binaries on a system. I'm not a lawyer though and I'd be interested to know if you've heard a different interpretation of the license?

Quoted 3 lines

Quoted 1 line
And, BTW, there is one more little script under GPLv3 - tests/ts/lscpu/lscpu
As Nitin replied, I thought that was removed already?

I think it's important to keep in mind that the responsibilities for redistribution/repackaging really are up to the end user (of OE-core) and their lawyer's interpretation of the license.

As Richard mentioned, our goal is specifically to keep any code (that we know of) that is GPLv3/LGPLv3 off of the target system via the exclude license feature. (Which can also be used to target other license types.)

Source distribution and such is still the responsibility of the (OE-core) end-user and their lawyers to determine. What we did might be good enough, and might not..

--Mark

Quoted 10 lines

Cheers,
Richard
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky