* [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
@ 2015-07-06 1:51 Lei Maohui
2015-07-06 22:22 ` Andre McCurdy
2015-08-31 17:58 ` Martin Jansa
0 siblings, 2 replies; 22+ messages in thread
From: Lei Maohui @ 2015-07-06 1:51 UTC (permalink / raw)
To: openembedded-devel
In oe-core,the parted is GPLv3,so add parted-1.8.6 which is not GPLv3.
Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
---
.../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 11 ++++
.../1001parted-1.8.6-notransname1.patch | 39 ++++++++++++++
.../1002parted-1.8.6-off-by-one1.patch | 25 +++++++++
.../1003parted-1.8.6-primary-boundary1.patch | 12 +++++
.../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 50 +++++++++++++++++
| 13 +++++
.../parted/parted-1.8.6/7000no_effect_macro1.patch | 11 ++++
.../parted/parted-1.8.6/ui.c-fix-build-error.patch | 26 +++++++++
meta-oe/recipes-extended/parted/parted_1.8.6.bb | 62 ++++++++++++++++++++++
9 files changed, 249 insertions(+)
create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
create mode 100644 meta-oe/recipes-extended/parted/parted_1.8.6.bb
diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
new file mode 100644
index 0000000..c8b2e7d
--- /dev/null
+++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
@@ -0,0 +1,11 @@
+--- parted-1.8.6/libparted/fs/linux_swap/linux_swap.c.warnings 2007-03-20 13:22:36.000000000 -0400
++++ parted-1.8.6/libparted/fs/linux_swap/linux_swap.c 2007-03-20 13:59:11.000000000 -0400
+@@ -123,7 +123,7 @@
+
+ error_close_fs:
+ swap_close (fs);
+-error:
++
+ return 0;
+ }
+ #endif /* !DISCOVER_ONLY */
diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
new file mode 100644
index 0000000..5fdf10b
--- /dev/null
+++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
@@ -0,0 +1,39 @@
+--- parted-1.8.6/parted/parted.c.notransname 2007-03-13 13:01:09.000000000 -0400
++++ parted-1.8.6/parted/parted.c 2007-03-21 10:50:35.000000000 -0400
+@@ -1429,7 +1429,7 @@
+ part->fs_type->name : "");
+
+ if (has_name) {
+- name = _(ped_partition_get_name (part));
++ name = ped_partition_get_name (part);
+ str_list_append (row, name);
+ }
+
+--- parted-1.8.6/parted/table.c.notransname 2007-03-13 13:01:09.000000000 -0400
++++ parted-1.8.6/parted/table.c 2007-03-21 10:51:31.000000000 -0400
+@@ -191,7 +191,8 @@
+ len += wcslen(COLSUFFIX);
+
+ newsize = (wcslen(*s) + len + 1) * sizeof(wchar_t);
+- *s = realloc (*s, newsize);
++ *s = (wchar_t *) realloc (*s, newsize);
++ assert(*s != NULL);
+
+ for (i = 0; i < ncols; ++i)
+ {
+@@ -199,6 +200,7 @@
+ int nspaces = max(t->widths[i] - wcswidth(row[i], MAX_WIDTH),
+ 0);
+ wchar_t* pad = malloc ( (nspaces + 1) * sizeof(wchar_t) );
++ assert(pad != NULL);
+
+ for (j = 0; j < nspaces; ++j)
+ pad[j] = L' ';
+@@ -211,6 +213,7 @@
+ wcscat (*s, DELIMITER);
+
+ free (pad);
++ pad = NULL;
+ }
+
+ wcscat (*s, COLSUFFIX);
diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
new file mode 100644
index 0000000..9652a98
--- /dev/null
+++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
@@ -0,0 +1,25 @@
+--- parted-1.8.6/parted/parted.c.offbyone 2007-04-11 12:13:06.000000000 -0400
++++ parted-1.8.6/parted/parted.c 2007-04-11 12:13:21.000000000 -0400
+@@ -1217,6 +1217,7 @@
+ static int
+ do_print (PedDevice** dev)
+ {
++ PedUnit default_unit;
+ PedDisk* disk;
+ Table* table;
+ StrList* row;
+@@ -1303,11 +1304,12 @@
+ }
+
+ start = ped_unit_format (*dev, 0);
++ default_unit = ped_unit_get_default ();
+ end = ped_unit_format_byte (*dev, (*dev)->length * (*dev)->sector_size
+- - 1 );
++ - (default_unit == PED_UNIT_CHS || default_unit == PED_UNIT_CYLINDER));
+
+ if (opt_machine_mode) {
+- switch (ped_unit_get_default ()) {
++ switch (default_unit) {
+ case PED_UNIT_CHS: puts ("CHS;");
+ break;
+ case PED_UNIT_CYLINDER: puts ("CYL;");
diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
new file mode 100644
index 0000000..0366977
--- /dev/null
+++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
@@ -0,0 +1,12 @@
+--- parted-1.8.6/libparted/labels/dos.c.boundary 2007-03-13 13:01:09.000000000 -0400
++++ parted-1.8.6/libparted/labels/dos.c 2007-04-11 14:56:54.000000000 -0400
+@@ -1696,8 +1696,7 @@
+ _primary_start_constraint (disk, part,
+ bios_geom, min_geom)));
+
+- if (!solution)
+- solution = _best_solution (part, bios_geom, solution,
++ solution = _best_solution (part, bios_geom, solution,
+ _try_constraint (part, constraint,
+ _primary_constraint (disk, bios_geom,
+ min_geom)));
diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
new file mode 100644
index 0000000..17ec29a
--- /dev/null
+++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
@@ -0,0 +1,50 @@
+diff -up parted-1.8.6/libparted/arch/linux.c.xvd parted-1.8.6/libparted/arch/linux.c
+--- parted-1.8.6/libparted/arch/linux.c.xvd 2007-08-07 14:05:59.000000000 -0400
++++ parted-1.8.6/libparted/arch/linux.c 2007-08-07 14:07:13.000000000 -0400
+@@ -248,6 +248,7 @@ struct blkdev_ioctl_param {
+ #define VIODASD_MAJOR 112
+ #define SX8_MAJOR1 160
+ #define SX8_MAJOR2 161
++#define XVD_MAJOR 202
+
+ #define SCSI_BLK_MAJOR(M) ( \
+ (M) == SCSI_DISK0_MAJOR \
+@@ -450,6 +451,8 @@ _device_probe_type (PedDevice* dev)
+ } else if (_is_dm_major(dev_major)) {
+ dev->type = PED_DEVICE_DM;
+ #endif
++ } else if (dev_major == XVD_MAJOR && (dev_minor % 0x10 == 0)) {
++ dev->type = PED_DEVICE_XVD;
+ } else {
+ dev->type = PED_DEVICE_UNKNOWN;
+ }
+@@ -1152,6 +1155,11 @@ linux_new (const char* path)
+ break;
+ #endif
+
++ case PED_DEVICE_XVD:
++ if (!init_generic (dev, _("Xen Virtual Block Device")))
++ goto error_free_arch_specific;
++ break;
++
+ case PED_DEVICE_UNKNOWN:
+ if (!init_generic (dev, _("Unknown")))
+ goto error_free_arch_specific;
+diff -up parted-1.8.6/include/parted/device.h.xvd parted-1.8.6/include/parted/device.h
+--- parted-1.8.6/include/parted/device.h.xvd 2007-01-12 10:15:10.000000000 -0500
++++ parted-1.8.6/include/parted/device.h 2007-08-07 14:07:13.000000000 -0400
+@@ -45,11 +45,11 @@ typedef enum {
+ PED_DEVICE_UBD = 8,
+ PED_DEVICE_DASD = 9,
+ PED_DEVICE_VIODASD = 10,
+- PED_DEVICE_SX8 = 11
++ PED_DEVICE_SX8 = 11,
+ #ifdef ENABLE_DEVICE_MAPPER
+- ,
+- PED_DEVICE_DM = 12
++ PED_DEVICE_DM = 12,
+ #endif
++ PED_DEVICE_XVD = 13
+ } PedDeviceType;
+
+ typedef struct _PedDevice PedDevice;
--git a/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
new file mode 100644
index 0000000..536a20d
--- /dev/null
+++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
@@ -0,0 +1,13 @@
+diff -up parted-1.8.6/include/parted/device.h.devmapper parted-1.8.6/include/parted/device.h
+--- parted-1.8.6/include/parted/device.h.devmapper 2007-10-04 15:39:27.000000000 -0400
++++ parted-1.8.6/include/parted/device.h 2007-10-04 15:40:11.000000000 -0400
+@@ -46,9 +46,7 @@ typedef enum {
+ PED_DEVICE_DASD = 9,
+ PED_DEVICE_VIODASD = 10,
+ PED_DEVICE_SX8 = 11,
+-#ifdef ENABLE_DEVICE_MAPPER
+ PED_DEVICE_DM = 12,
+-#endif
+ PED_DEVICE_XVD = 13
+ } PedDeviceType;
+
diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
new file mode 100644
index 0000000..033f3f5
--- /dev/null
+++ b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
@@ -0,0 +1,11 @@
+--- parted-1.8.6/parted/table.c 2010-11-02 13:37:16.256204798 +0900
++++ parted-1.8.6/parted/table.c 2010-11-02 13:45:16.231266752 +0900
+@@ -43,7 +43,7 @@
+ # define wcslen strlen
+ # define wcswidth strnlen
+ # define wcscat strcat
+-# define wcsdup strdup
++/* # define wcsdup strdup */
+ size_t strnlen (const char *, size_t);
+ #endif
+
diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
new file mode 100644
index 0000000..777fe6a
--- /dev/null
+++ b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
@@ -0,0 +1,26 @@
+From 4f4dfd5aabdaadd8f495e193ca8daed5a3a1782a Mon Sep 17 00:00:00 2001
+From: Li xin <lixin.fnst@cn.fujitsu.com>
+Date: Fri, 28 Nov 2014 02:49:19 +0900
+Subject: [PATCH] parted/ui.c : fix build error
+
+Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
+---
+ parted/ui.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/parted/ui.c b/parted/ui.c
+index 59cb98b..b583693 100644
+--- a/parted/ui.c
++++ b/parted/ui.c
+@@ -1376,7 +1376,7 @@ init_ui ()
+
+ #ifdef HAVE_LIBREADLINE
+ rl_initialize ();
+- rl_attempted_completion_function = (CPPFunction*) complete_function;
++ rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
+ readline_state.in_readline = 0;
+ #endif
+
+--
+1.8.4.2
+
diff --git a/meta-oe/recipes-extended/parted/parted_1.8.6.bb b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
new file mode 100644
index 0000000..537978f
--- /dev/null
+++ b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
@@ -0,0 +1,62 @@
+SUMMARY = "The GNU disk partition manipulation program"
+DESCRIPTION = "The GNU Parted program allows you to create, destroy, resize, move, \
+and copy hard disk partitions. Parted can be used for creating space \
+for new operating systems, reorganizing disk usage, and copying data \
+to new hard disks."
+HOMEPAGE = "http://www.gnu.org/software/parted"
+SECTION = "Applications/System"
+
+SRC_URI = "http://ftp.gnu.org/gnu/parted/parted-1.8.6.tar.bz2 \
+ file://1000parted-1.8.6-warnings1.patch \
+ file://1001parted-1.8.6-notransname1.patch \
+ file://1002parted-1.8.6-off-by-one1.patch \
+ file://1003parted-1.8.6-primary-boundary1.patch \
+ file://1004parted-1.8.6-xvd1.patch \
+ file://1005parted-1.8.6-devmapper-header1.patch \
+ file://7000no_effect_macro1.patch \
+ file://ui.c-fix-build-error.patch \
+ "
+
+SRC_URI[md5sum] = "03c967ae0e915e08da90605d68ba93d7"
+SRC_URI[sha256sum] = "82d94c9bb58cccd1eacfc5ff3a9331d179cc26d8fbe00c451e2c84feb6d23408"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
+
+inherit autotools gettext pkgconfig
+
+DEPENDS = "lvm2 readline"
+
+EXTRA_OECONF = "--enable-device-mapper \
+ --disable-selinux \
+ --disable-static \
+ --sbindir=${sbindir} \
+ --disable-Werror \
+ --disable-rpath \
+ "
+EXTRA_OEMAKE = "DESTDIR=${D}"
+
+do_configure_prepend() {
+ # ltmain.sh will set rpath to path on host.
+ for l in `find ${S} -name "ltmain\.sh"` ; do
+ sed -i -e 's/\$compile_rpath//g' \
+ -e 's/\$finalize_rpath//g' ${l}
+ done
+
+ # FIXME: Some option may be needed by EXTRA_OECONF.
+ sed -i 's/ac_cv_func_malloc_0_nonnull=no/ac_cv_func_malloc_0_nonnull=yes/g' ${S}/configure
+ sed -i 's/ac_cv_func_calloc_0_nonnull=no/ac_cv_func_calloc_0_nonnull=yes/g' ${S}/configure
+ sed -i 's/ac_cv_func_memcmp_working=no/ac_cv_func_memcmp_working=yes/g' ${S}/configure
+ sed -i 's/ac_cv_func_realloc_0_nonnull=no/ac_cv_func_realloc_0_nonnull=yes/g' ${S}/configure
+}
+
+do_configure() {
+ oe_runconf
+}
+
+do_install_append() {
+ /bin/rm -rf ${D}/${libdir}/*.la
+ /bin/rm -rf ${D}/usr/share/info/dir
+ /bin/rm -fr ${D}/usr/bin
+}
+
--
1.8.4.2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-07-06 1:51 [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3 Lei Maohui
@ 2015-07-06 22:22 ` Andre McCurdy
2015-07-07 3:50 ` FW: [oe] " Lei, Maohui
2015-08-31 17:58 ` Martin Jansa
1 sibling, 1 reply; 22+ messages in thread
From: Andre McCurdy @ 2015-07-06 22:22 UTC (permalink / raw)
To: openembedded-devel
On Sun, Jul 5, 2015 at 6:51 PM, Lei Maohui <leimaohui@cn.fujitsu.com> wrote:
> In oe-core,the parted is GPLv3,so add parted-1.8.6 which is not GPLv3.
Thanks, it's good to have a non-GPLv3 recipe for parted.
However, if the GPLv3 recipe is in oe-core then the non-GPLv3 version
should be in oe-core as well, not in in meta-oe.
The reason is that recipes in meta-oe have a higher priority
(BBFILE_PRIORITY == 6) than those in oe-core (BBFILE_PRIORITY == 5).
Therefore if you add a parted recipe to meta-oe then it will be used
by default, which will be wrong for anyone who wants to continue to
use the GPLv3 version in oe-core.
http://www.yoctoproject.org/docs/current/mega-manual/mega-manual.html#var-BBFILE_PRIORITY
> Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
> ---
> .../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 11 ++++
> .../1001parted-1.8.6-notransname1.patch | 39 ++++++++++++++
> .../1002parted-1.8.6-off-by-one1.patch | 25 +++++++++
> .../1003parted-1.8.6-primary-boundary1.patch | 12 +++++
> .../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 50 +++++++++++++++++
> .../1005parted-1.8.6-devmapper-header1.patch | 13 +++++
> .../parted/parted-1.8.6/7000no_effect_macro1.patch | 11 ++++
> .../parted/parted-1.8.6/ui.c-fix-build-error.patch | 26 +++++++++
> meta-oe/recipes-extended/parted/parted_1.8.6.bb | 62 ++++++++++++++++++++++
> 9 files changed, 249 insertions(+)
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted_1.8.6.bb
>
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
> new file mode 100644
> index 0000000..c8b2e7d
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
> @@ -0,0 +1,11 @@
> +--- parted-1.8.6/libparted/fs/linux_swap/linux_swap.c.warnings 2007-03-20 13:22:36.000000000 -0400
> ++++ parted-1.8.6/libparted/fs/linux_swap/linux_swap.c 2007-03-20 13:59:11.000000000 -0400
> +@@ -123,7 +123,7 @@
> +
> + error_close_fs:
> + swap_close (fs);
> +-error:
> ++
> + return 0;
> + }
> + #endif /* !DISCOVER_ONLY */
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
> new file mode 100644
> index 0000000..5fdf10b
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
> @@ -0,0 +1,39 @@
> +--- parted-1.8.6/parted/parted.c.notransname 2007-03-13 13:01:09.000000000 -0400
> ++++ parted-1.8.6/parted/parted.c 2007-03-21 10:50:35.000000000 -0400
> +@@ -1429,7 +1429,7 @@
> + part->fs_type->name : "");
> +
> + if (has_name) {
> +- name = _(ped_partition_get_name (part));
> ++ name = ped_partition_get_name (part);
> + str_list_append (row, name);
> + }
> +
> +--- parted-1.8.6/parted/table.c.notransname 2007-03-13 13:01:09.000000000 -0400
> ++++ parted-1.8.6/parted/table.c 2007-03-21 10:51:31.000000000 -0400
> +@@ -191,7 +191,8 @@
> + len += wcslen(COLSUFFIX);
> +
> + newsize = (wcslen(*s) + len + 1) * sizeof(wchar_t);
> +- *s = realloc (*s, newsize);
> ++ *s = (wchar_t *) realloc (*s, newsize);
> ++ assert(*s != NULL);
> +
> + for (i = 0; i < ncols; ++i)
> + {
> +@@ -199,6 +200,7 @@
> + int nspaces = max(t->widths[i] - wcswidth(row[i], MAX_WIDTH),
> + 0);
> + wchar_t* pad = malloc ( (nspaces + 1) * sizeof(wchar_t) );
> ++ assert(pad != NULL);
> +
> + for (j = 0; j < nspaces; ++j)
> + pad[j] = L' ';
> +@@ -211,6 +213,7 @@
> + wcscat (*s, DELIMITER);
> +
> + free (pad);
> ++ pad = NULL;
> + }
> +
> + wcscat (*s, COLSUFFIX);
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
> new file mode 100644
> index 0000000..9652a98
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
> @@ -0,0 +1,25 @@
> +--- parted-1.8.6/parted/parted.c.offbyone 2007-04-11 12:13:06.000000000 -0400
> ++++ parted-1.8.6/parted/parted.c 2007-04-11 12:13:21.000000000 -0400
> +@@ -1217,6 +1217,7 @@
> + static int
> + do_print (PedDevice** dev)
> + {
> ++ PedUnit default_unit;
> + PedDisk* disk;
> + Table* table;
> + StrList* row;
> +@@ -1303,11 +1304,12 @@
> + }
> +
> + start = ped_unit_format (*dev, 0);
> ++ default_unit = ped_unit_get_default ();
> + end = ped_unit_format_byte (*dev, (*dev)->length * (*dev)->sector_size
> +- - 1 );
> ++ - (default_unit == PED_UNIT_CHS || default_unit == PED_UNIT_CYLINDER));
> +
> + if (opt_machine_mode) {
> +- switch (ped_unit_get_default ()) {
> ++ switch (default_unit) {
> + case PED_UNIT_CHS: puts ("CHS;");
> + break;
> + case PED_UNIT_CYLINDER: puts ("CYL;");
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
> new file mode 100644
> index 0000000..0366977
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
> @@ -0,0 +1,12 @@
> +--- parted-1.8.6/libparted/labels/dos.c.boundary 2007-03-13 13:01:09.000000000 -0400
> ++++ parted-1.8.6/libparted/labels/dos.c 2007-04-11 14:56:54.000000000 -0400
> +@@ -1696,8 +1696,7 @@
> + _primary_start_constraint (disk, part,
> + bios_geom, min_geom)));
> +
> +- if (!solution)
> +- solution = _best_solution (part, bios_geom, solution,
> ++ solution = _best_solution (part, bios_geom, solution,
> + _try_constraint (part, constraint,
> + _primary_constraint (disk, bios_geom,
> + min_geom)));
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
> new file mode 100644
> index 0000000..17ec29a
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
> @@ -0,0 +1,50 @@
> +diff -up parted-1.8.6/libparted/arch/linux.c.xvd parted-1.8.6/libparted/arch/linux.c
> +--- parted-1.8.6/libparted/arch/linux.c.xvd 2007-08-07 14:05:59.000000000 -0400
> ++++ parted-1.8.6/libparted/arch/linux.c 2007-08-07 14:07:13.000000000 -0400
> +@@ -248,6 +248,7 @@ struct blkdev_ioctl_param {
> + #define VIODASD_MAJOR 112
> + #define SX8_MAJOR1 160
> + #define SX8_MAJOR2 161
> ++#define XVD_MAJOR 202
> +
> + #define SCSI_BLK_MAJOR(M) ( \
> + (M) == SCSI_DISK0_MAJOR \
> +@@ -450,6 +451,8 @@ _device_probe_type (PedDevice* dev)
> + } else if (_is_dm_major(dev_major)) {
> + dev->type = PED_DEVICE_DM;
> + #endif
> ++ } else if (dev_major == XVD_MAJOR && (dev_minor % 0x10 == 0)) {
> ++ dev->type = PED_DEVICE_XVD;
> + } else {
> + dev->type = PED_DEVICE_UNKNOWN;
> + }
> +@@ -1152,6 +1155,11 @@ linux_new (const char* path)
> + break;
> + #endif
> +
> ++ case PED_DEVICE_XVD:
> ++ if (!init_generic (dev, _("Xen Virtual Block Device")))
> ++ goto error_free_arch_specific;
> ++ break;
> ++
> + case PED_DEVICE_UNKNOWN:
> + if (!init_generic (dev, _("Unknown")))
> + goto error_free_arch_specific;
> +diff -up parted-1.8.6/include/parted/device.h.xvd parted-1.8.6/include/parted/device.h
> +--- parted-1.8.6/include/parted/device.h.xvd 2007-01-12 10:15:10.000000000 -0500
> ++++ parted-1.8.6/include/parted/device.h 2007-08-07 14:07:13.000000000 -0400
> +@@ -45,11 +45,11 @@ typedef enum {
> + PED_DEVICE_UBD = 8,
> + PED_DEVICE_DASD = 9,
> + PED_DEVICE_VIODASD = 10,
> +- PED_DEVICE_SX8 = 11
> ++ PED_DEVICE_SX8 = 11,
> + #ifdef ENABLE_DEVICE_MAPPER
> +- ,
> +- PED_DEVICE_DM = 12
> ++ PED_DEVICE_DM = 12,
> + #endif
> ++ PED_DEVICE_XVD = 13
> + } PedDeviceType;
> +
> + typedef struct _PedDevice PedDevice;
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
> new file mode 100644
> index 0000000..536a20d
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
> @@ -0,0 +1,13 @@
> +diff -up parted-1.8.6/include/parted/device.h.devmapper parted-1.8.6/include/parted/device.h
> +--- parted-1.8.6/include/parted/device.h.devmapper 2007-10-04 15:39:27.000000000 -0400
> ++++ parted-1.8.6/include/parted/device.h 2007-10-04 15:40:11.000000000 -0400
> +@@ -46,9 +46,7 @@ typedef enum {
> + PED_DEVICE_DASD = 9,
> + PED_DEVICE_VIODASD = 10,
> + PED_DEVICE_SX8 = 11,
> +-#ifdef ENABLE_DEVICE_MAPPER
> + PED_DEVICE_DM = 12,
> +-#endif
> + PED_DEVICE_XVD = 13
> + } PedDeviceType;
> +
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
> new file mode 100644
> index 0000000..033f3f5
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
> @@ -0,0 +1,11 @@
> +--- parted-1.8.6/parted/table.c 2010-11-02 13:37:16.256204798 +0900
> ++++ parted-1.8.6/parted/table.c 2010-11-02 13:45:16.231266752 +0900
> +@@ -43,7 +43,7 @@
> + # define wcslen strlen
> + # define wcswidth strnlen
> + # define wcscat strcat
> +-# define wcsdup strdup
> ++/* # define wcsdup strdup */
> + size_t strnlen (const char *, size_t);
> + #endif
> +
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
> new file mode 100644
> index 0000000..777fe6a
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
> @@ -0,0 +1,26 @@
> +From 4f4dfd5aabdaadd8f495e193ca8daed5a3a1782a Mon Sep 17 00:00:00 2001
> +From: Li xin <lixin.fnst@cn.fujitsu.com>
> +Date: Fri, 28 Nov 2014 02:49:19 +0900
> +Subject: [PATCH] parted/ui.c : fix build error
> +
> +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> +---
> + parted/ui.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/parted/ui.c b/parted/ui.c
> +index 59cb98b..b583693 100644
> +--- a/parted/ui.c
> ++++ b/parted/ui.c
> +@@ -1376,7 +1376,7 @@ init_ui ()
> +
> + #ifdef HAVE_LIBREADLINE
> + rl_initialize ();
> +- rl_attempted_completion_function = (CPPFunction*) complete_function;
> ++ rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
> + readline_state.in_readline = 0;
> + #endif
> +
> +--
> +1.8.4.2
> +
> diff --git a/meta-oe/recipes-extended/parted/parted_1.8.6.bb b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
> new file mode 100644
> index 0000000..537978f
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
> @@ -0,0 +1,62 @@
> +SUMMARY = "The GNU disk partition manipulation program"
> +DESCRIPTION = "The GNU Parted program allows you to create, destroy, resize, move, \
> +and copy hard disk partitions. Parted can be used for creating space \
> +for new operating systems, reorganizing disk usage, and copying data \
> +to new hard disks."
> +HOMEPAGE = "http://www.gnu.org/software/parted"
> +SECTION = "Applications/System"
> +
> +SRC_URI = "http://ftp.gnu.org/gnu/parted/parted-1.8.6.tar.bz2 \
> + file://1000parted-1.8.6-warnings1.patch \
> + file://1001parted-1.8.6-notransname1.patch \
> + file://1002parted-1.8.6-off-by-one1.patch \
> + file://1003parted-1.8.6-primary-boundary1.patch \
> + file://1004parted-1.8.6-xvd1.patch \
> + file://1005parted-1.8.6-devmapper-header1.patch \
> + file://7000no_effect_macro1.patch \
> + file://ui.c-fix-build-error.patch \
> + "
> +
> +SRC_URI[md5sum] = "03c967ae0e915e08da90605d68ba93d7"
> +SRC_URI[sha256sum] = "82d94c9bb58cccd1eacfc5ff3a9331d179cc26d8fbe00c451e2c84feb6d23408"
> +
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
> +
> +inherit autotools gettext pkgconfig
> +
> +DEPENDS = "lvm2 readline"
> +
> +EXTRA_OECONF = "--enable-device-mapper \
> + --disable-selinux \
> + --disable-static \
> + --sbindir=${sbindir} \
> + --disable-Werror \
> + --disable-rpath \
> + "
> +EXTRA_OEMAKE = "DESTDIR=${D}"
> +
> +do_configure_prepend() {
> + # ltmain.sh will set rpath to path on host.
> + for l in `find ${S} -name "ltmain\.sh"` ; do
> + sed -i -e 's/\$compile_rpath//g' \
> + -e 's/\$finalize_rpath//g' ${l}
> + done
> +
> + # FIXME: Some option may be needed by EXTRA_OECONF.
> + sed -i 's/ac_cv_func_malloc_0_nonnull=no/ac_cv_func_malloc_0_nonnull=yes/g' ${S}/configure
> + sed -i 's/ac_cv_func_calloc_0_nonnull=no/ac_cv_func_calloc_0_nonnull=yes/g' ${S}/configure
> + sed -i 's/ac_cv_func_memcmp_working=no/ac_cv_func_memcmp_working=yes/g' ${S}/configure
> + sed -i 's/ac_cv_func_realloc_0_nonnull=no/ac_cv_func_realloc_0_nonnull=yes/g' ${S}/configure
> +}
> +
> +do_configure() {
> + oe_runconf
> +}
> +
> +do_install_append() {
> + /bin/rm -rf ${D}/${libdir}/*.la
> + /bin/rm -rf ${D}/usr/share/info/dir
> + /bin/rm -fr ${D}/usr/bin
> +}
> +
> --
> 1.8.4.2
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-07-06 22:22 ` Andre McCurdy
@ 2015-07-07 3:50 ` Lei, Maohui
2015-07-07 8:18 ` Burton, Ross
0 siblings, 1 reply; 22+ messages in thread
From: Lei, Maohui @ 2015-07-07 3:50 UTC (permalink / raw)
To: openembedded-core@lists.openembedded.org
Hello,
Can non-GPLv3 parted be added into oe-core? I think not everybody wants to use the GPLv3 version.
Cheers
Lei
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of Andre
> McCurdy
> Sent: Tuesday, July 07, 2015 6:23 AM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
>
> On Sun, Jul 5, 2015 at 6:51 PM, Lei Maohui <leimaohui@cn.fujitsu.com> wrote:
> > In oe-core,the parted is GPLv3,so add parted-1.8.6 which is not GPLv3.
>
> Thanks, it's good to have a non-GPLv3 recipe for parted.
>
> However, if the GPLv3 recipe is in oe-core then the non-GPLv3 version should be in
> oe-core as well, not in in meta-oe.
>
> The reason is that recipes in meta-oe have a higher priority (BBFILE_PRIORITY == 6) than
> those in oe-core (BBFILE_PRIORITY == 5).
> Therefore if you add a parted recipe to meta-oe then it will be used by default, which will
> be wrong for anyone who wants to continue to use the GPLv3 version in oe-core.
>
>
> http://www.yoctoproject.org/docs/current/mega-manual/mega-manual.html#var-BBFILE_
> PRIORITY
>
>
> > Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
> > ---
> > .../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 11 ++++
> > .../1001parted-1.8.6-notransname1.patch | 39 ++++++++++++++
> > .../1002parted-1.8.6-off-by-one1.patch | 25 +++++++++
> > .../1003parted-1.8.6-primary-boundary1.patch | 12 +++++
> > .../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 50 +++++++++++++++++
> > .../1005parted-1.8.6-devmapper-header1.patch | 13 +++++
> > .../parted/parted-1.8.6/7000no_effect_macro1.patch | 11 ++++
> > .../parted/parted-1.8.6/ui.c-fix-build-error.patch | 26 +++++++++
> > meta-oe/recipes-extended/parted/parted_1.8.6.bb | 62
> ++++++++++++++++++++++
> > 9 files changed, 249 insertions(+)
> > create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings
> > 1.patch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransn
> > ame1.patch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-o
> > ne1.patch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-
> > boundary1.patch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.pat
> > ch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmappe
> > r-header1.patch create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patc
> > h create mode 100644
> > meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patc
> > h create mode 100644 meta-oe/recipes-extended/parted/parted_1.8.6.bb
> >
> > diff --git
> > a/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnin
> > gs1.patch
> > b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnin
> > gs1.patch
> > new file mode 100644
> > index 0000000..c8b2e7d
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-wa
> > +++ rnings1.patch
> > @@ -0,0 +1,11 @@
> > +--- parted-1.8.6/libparted/fs/linux_swap/linux_swap.c.warnings
> > +2007-03-20 13:22:36.000000000 -0400
> > ++++ parted-1.8.6/libparted/fs/linux_swap/linux_swap.c 2007-03-20
> > ++++ 13:59:11.000000000 -0400
> > +@@ -123,7 +123,7 @@
> > +
> > + error_close_fs:
> > + swap_close (fs);
> > +-error:
> > ++
> > + return 0;
> > + }
> > + #endif /* !DISCOVER_ONLY */
> > diff --git
> > a/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notran
> > sname1.patch
> > b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notran
> > sname1.patch
> > new file mode 100644
> > index 0000000..5fdf10b
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-no
> > +++ transname1.patch
> > @@ -0,0 +1,39 @@
> > +--- parted-1.8.6/parted/parted.c.notransname 2007-03-13 13:01:09.000000000 -0400
> > ++++ parted-1.8.6/parted/parted.c 2007-03-21 10:50:35.000000000 -0400
> > +@@ -1429,7 +1429,7 @@
> > + part->fs_type->name :
> > +"");
> > +
> > + if (has_name) {
> > +- name = _(ped_partition_get_name (part));
> > ++ name = ped_partition_get_name
> > ++ (part);
> > + str_list_append (row, name);
> > + }
> > +
> > +--- parted-1.8.6/parted/table.c.notransname 2007-03-13 13:01:09.000000000 -0400
> > ++++ parted-1.8.6/parted/table.c 2007-03-21 10:51:31.000000000 -0400
> > +@@ -191,7 +191,8 @@
> > + len += wcslen(COLSUFFIX);
> > +
> > + newsize = (wcslen(*s) + len + 1) * sizeof(wchar_t);
> > +- *s = realloc (*s, newsize);
> > ++ *s = (wchar_t *) realloc (*s, newsize);
> > ++ assert(*s != NULL);
> > +
> > + for (i = 0; i < ncols; ++i)
> > + {
> > +@@ -199,6 +200,7 @@
> > + int nspaces = max(t->widths[i] - wcswidth(row[i], MAX_WIDTH),
> > + 0);
> > + wchar_t* pad = malloc ( (nspaces + 1) *
> > +sizeof(wchar_t) );
> > ++ assert(pad != NULL);
> > +
> > + for (j = 0; j < nspaces; ++j)
> > + pad[j] = L' '; @@ -211,6 +213,7 @@
> > + wcscat (*s, DELIMITER);
> > +
> > + free (pad);
> > ++ pad = NULL;
> > + }
> > +
> > + wcscat (*s, COLSUFFIX);
> > diff --git
> > a/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by
> > -one1.patch
> > b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by
> > -one1.patch
> > new file mode 100644
> > index 0000000..9652a98
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-of
> > +++ f-by-one1.patch
> > @@ -0,0 +1,25 @@
> > +--- parted-1.8.6/parted/parted.c.offbyone 2007-04-11 12:13:06.000000000 -0400
> > ++++ parted-1.8.6/parted/parted.c 2007-04-11 12:13:21.000000000 -0400
> > +@@ -1217,6 +1217,7 @@
> > + static int
> > + do_print (PedDevice** dev)
> > + {
> > ++ PedUnit default_unit;
> > + PedDisk* disk;
> > + Table* table;
> > + StrList* row;
> > +@@ -1303,11 +1304,12 @@
> > + }
> > +
> > + start = ped_unit_format (*dev, 0);
> > ++ default_unit = ped_unit_get_default ();
> > + end = ped_unit_format_byte (*dev, (*dev)->length * (*dev)->sector_size
> > +- - 1 );
> > ++ - (default_unit == PED_UNIT_CHS || default_unit ==
> > ++ PED_UNIT_CYLINDER));
> > +
> > + if (opt_machine_mode) {
> > +- switch (ped_unit_get_default ()) {
> > ++ switch (default_unit) {
> > + case PED_UNIT_CHS: puts ("CHS;");
> > + break;
> > + case PED_UNIT_CYLINDER: puts ("CYL;");
> > diff --git
> > a/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primar
> > y-boundary1.patch
> > b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primar
> > y-boundary1.patch
> > new file mode 100644
> > index 0000000..0366977
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-pr
> > +++ imary-boundary1.patch
> > @@ -0,0 +1,12 @@
> > +--- parted-1.8.6/libparted/labels/dos.c.boundary 2007-03-13
> 13:01:09.000000000 -0400
> > ++++ parted-1.8.6/libparted/labels/dos.c 2007-04-11 14:56:54.000000000
> -0400
> > +@@ -1696,8 +1696,7 @@
> > + _primary_start_constraint (disk, part,
> > + bios_geom,
> > +min_geom)));
> > +
> > +- if (!solution)
> > +- solution = _best_solution (part, bios_geom, solution,
> > ++ solution = _best_solution (part, bios_geom, solution,
> > + _try_constraint (part, constraint,
> > + _primary_constraint (disk, bios_geom,
> > + min_geom)));
> > diff --git
> > a/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.p
> > atch
> > b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.p
> > atch
> > new file mode 100644
> > index 0000000..17ec29a
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xv
> > +++ d1.patch
> > @@ -0,0 +1,50 @@
> > +diff -up parted-1.8.6/libparted/arch/linux.c.xvd parted-1.8.6/libparted/arch/linux.c
> > +--- parted-1.8.6/libparted/arch/linux.c.xvd 2007-08-07 14:05:59.000000000 -0400
> > ++++ parted-1.8.6/libparted/arch/linux.c 2007-08-07 14:07:13.000000000 -0400
> > +@@ -248,6 +248,7 @@ struct blkdev_ioctl_param {
> > + #define VIODASD_MAJOR 112
> > + #define SX8_MAJOR1 160
> > + #define SX8_MAJOR2 161
> > ++#define XVD_MAJOR 202
> > +
> > + #define SCSI_BLK_MAJOR(M)
> ( \
> > + (M) == SCSI_DISK0_MAJOR
> \
> > +@@ -450,6 +451,8 @@ _device_probe_type (PedDevice* dev)
> > + } else if (_is_dm_major(dev_major)) {
> > + dev->type = PED_DEVICE_DM; #endif
> > ++ } else if (dev_major == XVD_MAJOR && (dev_minor % 0x10 == 0)) {
> > ++ dev->type = PED_DEVICE_XVD;
> > + } else {
> > + dev->type = PED_DEVICE_UNKNOWN;
> > + }
> > +@@ -1152,6 +1155,11 @@ linux_new (const char* path)
> > + break;
> > + #endif
> > +
> > ++ case PED_DEVICE_XVD:
> > ++ if (!init_generic (dev, _("Xen Virtual Block Device")))
> > ++ goto error_free_arch_specific;
> > ++ break;
> > ++
> > + case PED_DEVICE_UNKNOWN:
> > + if (!init_generic (dev, _("Unknown")))
> > + goto error_free_arch_specific; diff -up
> > +parted-1.8.6/include/parted/device.h.xvd parted-1.8.6/include/parted/device.h
> > +--- parted-1.8.6/include/parted/device.h.xvd 2007-01-12 10:15:10.000000000 -0500
> > ++++ parted-1.8.6/include/parted/device.h 2007-08-07 14:07:13.000000000
> -0400
> > +@@ -45,11 +45,11 @@ typedef enum {
> > + PED_DEVICE_UBD = 8,
> > + PED_DEVICE_DASD = 9,
> > + PED_DEVICE_VIODASD = 10,
> > +- PED_DEVICE_SX8 = 11
> > ++ PED_DEVICE_SX8 = 11,
> > + #ifdef ENABLE_DEVICE_MAPPER
> > +- ,
> > +- PED_DEVICE_DM = 12
> > ++ PED_DEVICE_DM = 12,
> > + #endif
> > ++ PED_DEVICE_XVD = 13
> > + } PedDeviceType;
> > +
> > + typedef struct _PedDevice PedDevice;
> > diff --git
> > a/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmap
> > per-header1.patch
> > b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmap
> > per-header1.patch
> > new file mode 100644
> > index 0000000..536a20d
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-de
> > +++ vmapper-header1.patch
> > @@ -0,0 +1,13 @@
> > +diff -up parted-1.8.6/include/parted/device.h.devmapper
> parted-1.8.6/include/parted/device.h
> > +--- parted-1.8.6/include/parted/device.h.devmapper 2007-10-04
> 15:39:27.000000000 -0400
> > ++++ parted-1.8.6/include/parted/device.h 2007-10-04 15:40:11.000000000
> -0400
> > +@@ -46,9 +46,7 @@ typedef enum {
> > + PED_DEVICE_DASD = 9,
> > + PED_DEVICE_VIODASD = 10,
> > + PED_DEVICE_SX8 = 11,
> > +-#ifdef ENABLE_DEVICE_MAPPER
> > + PED_DEVICE_DM = 12,
> > +-#endif
> > + PED_DEVICE_XVD = 13
> > + } PedDeviceType;
> > +
> > diff --git
> > a/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.pa
> > tch
> > b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.pa
> > tch
> > new file mode 100644
> > index 0000000..033f3f5
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro
> > +++ 1.patch
> > @@ -0,0 +1,11 @@
> > +--- parted-1.8.6/parted/table.c 2010-11-02 13:37:16.256204798 +0900
> > ++++ parted-1.8.6/parted/table.c 2010-11-02 13:45:16.231266752 +0900
> > +@@ -43,7 +43,7 @@
> > + # define wcslen strlen
> > + # define wcswidth strnlen
> > + # define wcscat strcat
> > +-# define wcsdup strdup
> > ++/* # define wcsdup strdup */
> > + size_t strnlen (const char *, size_t); #endif
> > +
> > diff --git
> > a/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.pa
> > tch
> > b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.pa
> > tch
> > new file mode 100644
> > index 0000000..777fe6a
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-erro
> > +++ r.patch
> > @@ -0,0 +1,26 @@
> > +From 4f4dfd5aabdaadd8f495e193ca8daed5a3a1782a Mon Sep 17 00:00:00
> > +2001
> > +From: Li xin <lixin.fnst@cn.fujitsu.com>
> > +Date: Fri, 28 Nov 2014 02:49:19 +0900
> > +Subject: [PATCH] parted/ui.c : fix build error
> > +
> > +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> > +---
> > + parted/ui.c | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/parted/ui.c b/parted/ui.c index 59cb98b..b583693 100644
> > +--- a/parted/ui.c
> > ++++ b/parted/ui.c
> > +@@ -1376,7 +1376,7 @@ init_ui ()
> > +
> > + #ifdef HAVE_LIBREADLINE
> > + rl_initialize ();
> > +- rl_attempted_completion_function = (CPPFunction*) complete_function;
> > ++ rl_attempted_completion_function = (rl_completion_func_t*)
> > ++ complete_function;
> > + readline_state.in_readline = 0; #endif
> > +
> > +--
> > +1.8.4.2
> > +
> > diff --git a/meta-oe/recipes-extended/parted/parted_1.8.6.bb
> > b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
> > new file mode 100644
> > index 0000000..537978f
> > --- /dev/null
> > +++ b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
> > @@ -0,0 +1,62 @@
> > +SUMMARY = "The GNU disk partition manipulation program"
> > +DESCRIPTION = "The GNU Parted program allows you to create, destroy,
> > +resize, move, \ and copy hard disk partitions. Parted can be used for
> > +creating space \ for new operating systems, reorganizing disk usage,
> > +and copying data \ to new hard disks."
> > +HOMEPAGE = "http://www.gnu.org/software/parted"
> > +SECTION = "Applications/System"
> > +
> > +SRC_URI = "http://ftp.gnu.org/gnu/parted/parted-1.8.6.tar.bz2 \
> > + file://1000parted-1.8.6-warnings1.patch \
> > + file://1001parted-1.8.6-notransname1.patch \
> > + file://1002parted-1.8.6-off-by-one1.patch \
> > + file://1003parted-1.8.6-primary-boundary1.patch \
> > + file://1004parted-1.8.6-xvd1.patch \
> > + file://1005parted-1.8.6-devmapper-header1.patch \
> > + file://7000no_effect_macro1.patch \
> > + file://ui.c-fix-build-error.patch \
> > + "
> > +
> > +SRC_URI[md5sum] = "03c967ae0e915e08da90605d68ba93d7"
> > +SRC_URI[sha256sum] =
> "82d94c9bb58cccd1eacfc5ff3a9331d179cc26d8fbe00c451e2c84feb6d23408"
> > +
> > +LICENSE = "GPLv2+"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
> > +
> > +inherit autotools gettext pkgconfig
> > +
> > +DEPENDS = "lvm2 readline"
> > +
> > +EXTRA_OECONF = "--enable-device-mapper \
> > + --disable-selinux \
> > + --disable-static \
> > + --sbindir=${sbindir} \
> > + --disable-Werror \
> > + --disable-rpath \
> > + "
> > +EXTRA_OEMAKE = "DESTDIR=${D}"
> > +
> > +do_configure_prepend() {
> > + # ltmain.sh will set rpath to path on host.
> > + for l in `find ${S} -name "ltmain\.sh"` ; do
> > + sed -i -e 's/\$compile_rpath//g' \
> > + -e 's/\$finalize_rpath//g' ${l}
> > + done
> > +
> > + # FIXME: Some option may be needed by EXTRA_OECONF.
> > + sed -i
> 's/ac_cv_func_malloc_0_nonnull=no/ac_cv_func_malloc_0_nonnull=yes/g'
> ${S}/configure
> > + sed -i
> 's/ac_cv_func_calloc_0_nonnull=no/ac_cv_func_calloc_0_nonnull=yes/g' ${S}/configure
> > + sed -i
> 's/ac_cv_func_memcmp_working=no/ac_cv_func_memcmp_working=yes/g'
> ${S}/configure
> > + sed -i
> > +'s/ac_cv_func_realloc_0_nonnull=no/ac_cv_func_realloc_0_nonnull=yes/g
> > +' ${S}/configure }
> > +
> > +do_configure() {
> > + oe_runconf
> > +}
> > +
> > +do_install_append() {
> > + /bin/rm -rf ${D}/${libdir}/*.la
> > + /bin/rm -rf ${D}/usr/share/info/dir
> > + /bin/rm -fr ${D}/usr/bin
> > +}
> > +
> > --
> > 1.8.4.2
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-07-07 3:50 ` FW: [oe] " Lei, Maohui
@ 2015-07-07 8:18 ` Burton, Ross
2015-07-07 13:30 ` Alexander Kanavin
2015-07-08 9:26 ` Lei, Maohui
0 siblings, 2 replies; 22+ messages in thread
From: Burton, Ross @ 2015-07-07 8:18 UTC (permalink / raw)
To: Lei, Maohui; +Cc: openembedded-core@lists.openembedded.org
[-- Attachment #1: Type: text/plain, Size: 274 bytes --]
On 7 July 2015 at 04:50, Lei, Maohui <leimaohui@cn.fujitsu.com> wrote:
> Can non-GPLv3 parted be added into oe-core? I think not everybody wants to
> use the GPLv3 version.
>
There's a good argument for this, so send a tested patch and it can be
reviewed.
Ross
[-- Attachment #2: Type: text/html, Size: 669 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-07-07 8:18 ` Burton, Ross
@ 2015-07-07 13:30 ` Alexander Kanavin
2015-07-07 13:38 ` Burton, Ross
2015-07-08 9:26 ` Lei, Maohui
1 sibling, 1 reply; 22+ messages in thread
From: Alexander Kanavin @ 2015-07-07 13:30 UTC (permalink / raw)
To: openembedded-core
On 07/07/2015 11:18 AM, Burton, Ross wrote:
> Can non-GPLv3 parted be added into oe-core? I think not everybody
> wants to use the GPLv3 version.
>
>
> There's a good argument for this, so send a tested patch and it can be
> reviewed.
How about renaming the recipe, so that it doesn't clash with the GPLv3
version? For example, parted1_1.8.6.bb. Then it can be kept outside of
oe-core.
Alex
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-07-07 13:30 ` Alexander Kanavin
@ 2015-07-07 13:38 ` Burton, Ross
2015-07-07 13:55 ` Alexander Kanavin
0 siblings, 1 reply; 22+ messages in thread
From: Burton, Ross @ 2015-07-07 13:38 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 471 bytes --]
On 7 July 2015 at 14:30, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:
> How about renaming the recipe, so that it doesn't clash with the GPLv3
> version? For example, parted1_1.8.6.bb. Then it can be kept outside of
> oe-core.
>
As they're just version variations that would be overly complex. Dropping
it in oe-core as it's a non-v3 alternative doesn't seem to be a problem to
me (as there's plenty of precedent for that already).
Ross
[-- Attachment #2: Type: text/html, Size: 973 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-07-07 13:38 ` Burton, Ross
@ 2015-07-07 13:55 ` Alexander Kanavin
2015-07-07 13:59 ` Otavio Salvador
2015-07-09 0:43 ` Lei, Maohui
0 siblings, 2 replies; 22+ messages in thread
From: Alexander Kanavin @ 2015-07-07 13:55 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On 07/07/2015 04:38 PM, Burton, Ross wrote:
> How about renaming the recipe, so that it doesn't clash with the
> GPLv3 version? For example, parted1_1.8.6.bb
> <http://parted1_1.8.6.bb>. Then it can be kept outside of oe-core.
>
>
> As they're just version variations that would be overly complex.
> Dropping it in oe-core as it's a non-v3 alternative doesn't seem to be a
> problem to me (as there's plenty of precedent for that already).
My problem is that parted 1.8.6 was released in 2007, and the recipe
already carries eight patches with it (and none of them has any
information about their origin).
Who's going to provide ongoing maintenance for all that? I would like
Lei to establish himself as the maintainer (through the maintainers.inc
file).
Regards,
Alex
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-07-07 13:55 ` Alexander Kanavin
@ 2015-07-07 13:59 ` Otavio Salvador
2015-07-08 9:18 ` Lei, Maohui
2015-07-09 0:43 ` Lei, Maohui
1 sibling, 1 reply; 22+ messages in thread
From: Otavio Salvador @ 2015-07-07 13:59 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
On Tue, Jul 7, 2015 at 10:55 AM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> On 07/07/2015 04:38 PM, Burton, Ross wrote:
>
>> How about renaming the recipe, so that it doesn't clash with the
>> GPLv3 version? For example, parted1_1.8.6.bb
>> <http://parted1_1.8.6.bb>. Then it can be kept outside of oe-core.
>>
>>
>> As they're just version variations that would be overly complex.
>> Dropping it in oe-core as it's a non-v3 alternative doesn't seem to be a
>> problem to me (as there's plenty of precedent for that already).
>
>
> My problem is that parted 1.8.6 was released in 2007, and the recipe already
> carries eight patches with it (and none of them has any information about
> their origin).
>
> Who's going to provide ongoing maintenance for all that? I would like Lei to
> establish himself as the maintainer (through the maintainers.inc file).
Agreed; 2007 I was still one of developers of it IIRC and since then,
Jim has improved it quite a lot.
To be honest, parted at that time has several issues with bigger disk
sectors and other stuff. I wouldn't like to see projects relying on
such old and buggy version.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-07-07 13:59 ` Otavio Salvador
@ 2015-07-08 9:18 ` Lei, Maohui
0 siblings, 0 replies; 22+ messages in thread
From: Lei, Maohui @ 2015-07-08 9:18 UTC (permalink / raw)
To: Otavio Salvador; +Cc: OE-core
Hi Otavio
> > Who's going to provide ongoing maintenance for all that? I would like
> > Lei to establish himself as the maintainer (through the maintainers.inc file).
>
> Agreed; 2007 I was still one of developers of it IIRC and since then, Jim has improved it
> quite a lot.
Thank you.
>
> To be honest, parted at that time has several issues with bigger disk sectors and other
> stuff. I wouldn't like to see projects relying on such old and buggy version.
>
Old version does have some issues. But I think it is better to provide a non-v3 version to user who does not mind of these issues.
Cheers
Lei
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Otavio
> Salvador
> Sent: Tuesday, July 07, 2015 10:00 PM
> To: Alexander Kanavin
> Cc: OE-core
> Subject: Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not
> GPLv3
>
> On Tue, Jul 7, 2015 at 10:55 AM, Alexander Kanavin <alexander.kanavin@linux.intel.com>
> wrote:
> > On 07/07/2015 04:38 PM, Burton, Ross wrote:
> >
> >> How about renaming the recipe, so that it doesn't clash with the
> >> GPLv3 version? For example, parted1_1.8.6.bb
> >> <http://parted1_1.8.6.bb>. Then it can be kept outside of oe-core.
> >>
> >>
> >> As they're just version variations that would be overly complex.
> >> Dropping it in oe-core as it's a non-v3 alternative doesn't seem to
> >> be a problem to me (as there's plenty of precedent for that already).
> >
> >
> > My problem is that parted 1.8.6 was released in 2007, and the recipe
> > already carries eight patches with it (and none of them has any
> > information about their origin).
> >
> > Who's going to provide ongoing maintenance for all that? I would like
> > Lei to establish himself as the maintainer (through the maintainers.inc file).
>
> Agreed; 2007 I was still one of developers of it IIRC and since then, Jim has improved it
> quite a lot.
>
> To be honest, parted at that time has several issues with bigger disk sectors and other
> stuff. I wouldn't like to see projects relying on such old and buggy version.
>
> --
> Otavio Salvador O.S. Systems
> http://www.ossystems.com.br http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-07-07 8:18 ` Burton, Ross
2015-07-07 13:30 ` Alexander Kanavin
@ 2015-07-08 9:26 ` Lei, Maohui
1 sibling, 0 replies; 22+ messages in thread
From: Lei, Maohui @ 2015-07-08 9:26 UTC (permalink / raw)
To: Burton, Ross; +Cc: openembedded-core@lists.openembedded.org
[-- Attachment #1: Type: text/plain, Size: 760 bytes --]
Hi Ross
> There's a good argument for this, so send a tested patch and it can be reviewed.
OK. I will add some comments in the eight patches of recipe, and send the patch later.
Cheers
Lei
From: Burton, Ross [mailto:ross.burton@intel.com]
Sent: Tuesday, July 07, 2015 4:19 PM
To: Lei, Maohui/雷 茂慧
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
On 7 July 2015 at 04:50, Lei, Maohui <leimaohui@cn.fujitsu.com<mailto:leimaohui@cn.fujitsu.com>> wrote:
Can non-GPLv3 parted be added into oe-core? I think not everybody wants to use the GPLv3 version.
There's a good argument for this, so send a tested patch and it can be reviewed.
Ross
[-- Attachment #2: Type: text/html, Size: 8255 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-07-07 13:55 ` Alexander Kanavin
2015-07-07 13:59 ` Otavio Salvador
@ 2015-07-09 0:43 ` Lei, Maohui
1 sibling, 0 replies; 22+ messages in thread
From: Lei, Maohui @ 2015-07-09 0:43 UTC (permalink / raw)
To: Alexander Kanavin, Burton, Ross; +Cc: OE-core
Hi Alex
> Who's going to provide ongoing maintenance for all that? I would like
> Lei to establish himself as the maintainer (through the maintainers.inc file).
Thank you. I'm very glad to do that.
Cheers
Lei
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Alexander Kanavin
> Sent: Tuesday, July 07, 2015 9:56 PM
> To: Burton, Ross
> Cc: OE-core
> Subject: Re: [OE-core] FW: [oe] [meta-oe][PATCH] parted_1.8.6.bb: add parted that not
> GPLv3
>
> On 07/07/2015 04:38 PM, Burton, Ross wrote:
>
> > How about renaming the recipe, so that it doesn't clash with the
> > GPLv3 version? For example, parted1_1.8.6.bb
> > <http://parted1_1.8.6.bb>. Then it can be kept outside of oe-core.
> >
> >
> > As they're just version variations that would be overly complex.
> > Dropping it in oe-core as it's a non-v3 alternative doesn't seem to be
> > a problem to me (as there's plenty of precedent for that already).
>
> My problem is that parted 1.8.6 was released in 2007, and the recipe already carries eight
> patches with it (and none of them has any information about their origin).
>
> Who's going to provide ongoing maintenance for all that? I would like Lei to establish
> himself as the maintainer (through the maintainers.inc file).
>
> Regards,
> Alex
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-07-06 1:51 [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3 Lei Maohui
2015-07-06 22:22 ` Andre McCurdy
@ 2015-08-31 17:58 ` Martin Jansa
2015-08-31 19:11 ` Andre McCurdy
1 sibling, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2015-08-31 17:58 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 15716 bytes --]
On Mon, Jul 06, 2015 at 09:51:34AM +0800, Lei Maohui wrote:
> In oe-core,the parted is GPLv3,so add parted-1.8.6 which is not GPLv3.
>
> Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
> ---
> .../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 11 ++++
> .../1001parted-1.8.6-notransname1.patch | 39 ++++++++++++++
> .../1002parted-1.8.6-off-by-one1.patch | 25 +++++++++
> .../1003parted-1.8.6-primary-boundary1.patch | 12 +++++
> .../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 50 +++++++++++++++++
> .../1005parted-1.8.6-devmapper-header1.patch | 13 +++++
> .../parted/parted-1.8.6/7000no_effect_macro1.patch | 11 ++++
> .../parted/parted-1.8.6/ui.c-fix-build-error.patch | 26 +++++++++
> meta-oe/recipes-extended/parted/parted_1.8.6.bb | 62 ++++++++++++++++++++++
> 9 files changed, 249 insertions(+)
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
> create mode 100644 meta-oe/recipes-extended/parted/parted_1.8.6.bb
I cannot take this to meta-oe, because as soon as it's added there it
will be used by all DISTROs even those who don't mind having GPLv3
version.
Everybody would need to define PREFERRED_VERSION, because
DEFAULT_PREFERENCE is useless across different layers :/
https://bugzilla.yoctoproject.org/show_bug.cgi?id=2964
So this either has to be introduced in oe-core or in completely separate
layer which would be included only by those who cannot use GPLv3.
Regards,
>
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
> new file mode 100644
> index 0000000..c8b2e7d
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
> @@ -0,0 +1,11 @@
> +--- parted-1.8.6/libparted/fs/linux_swap/linux_swap.c.warnings 2007-03-20 13:22:36.000000000 -0400
> ++++ parted-1.8.6/libparted/fs/linux_swap/linux_swap.c 2007-03-20 13:59:11.000000000 -0400
> +@@ -123,7 +123,7 @@
> +
> + error_close_fs:
> + swap_close (fs);
> +-error:
> ++
> + return 0;
> + }
> + #endif /* !DISCOVER_ONLY */
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
> new file mode 100644
> index 0000000..5fdf10b
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
> @@ -0,0 +1,39 @@
> +--- parted-1.8.6/parted/parted.c.notransname 2007-03-13 13:01:09.000000000 -0400
> ++++ parted-1.8.6/parted/parted.c 2007-03-21 10:50:35.000000000 -0400
> +@@ -1429,7 +1429,7 @@
> + part->fs_type->name : "");
> +
> + if (has_name) {
> +- name = _(ped_partition_get_name (part));
> ++ name = ped_partition_get_name (part);
> + str_list_append (row, name);
> + }
> +
> +--- parted-1.8.6/parted/table.c.notransname 2007-03-13 13:01:09.000000000 -0400
> ++++ parted-1.8.6/parted/table.c 2007-03-21 10:51:31.000000000 -0400
> +@@ -191,7 +191,8 @@
> + len += wcslen(COLSUFFIX);
> +
> + newsize = (wcslen(*s) + len + 1) * sizeof(wchar_t);
> +- *s = realloc (*s, newsize);
> ++ *s = (wchar_t *) realloc (*s, newsize);
> ++ assert(*s != NULL);
> +
> + for (i = 0; i < ncols; ++i)
> + {
> +@@ -199,6 +200,7 @@
> + int nspaces = max(t->widths[i] - wcswidth(row[i], MAX_WIDTH),
> + 0);
> + wchar_t* pad = malloc ( (nspaces + 1) * sizeof(wchar_t) );
> ++ assert(pad != NULL);
> +
> + for (j = 0; j < nspaces; ++j)
> + pad[j] = L' ';
> +@@ -211,6 +213,7 @@
> + wcscat (*s, DELIMITER);
> +
> + free (pad);
> ++ pad = NULL;
> + }
> +
> + wcscat (*s, COLSUFFIX);
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
> new file mode 100644
> index 0000000..9652a98
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
> @@ -0,0 +1,25 @@
> +--- parted-1.8.6/parted/parted.c.offbyone 2007-04-11 12:13:06.000000000 -0400
> ++++ parted-1.8.6/parted/parted.c 2007-04-11 12:13:21.000000000 -0400
> +@@ -1217,6 +1217,7 @@
> + static int
> + do_print (PedDevice** dev)
> + {
> ++ PedUnit default_unit;
> + PedDisk* disk;
> + Table* table;
> + StrList* row;
> +@@ -1303,11 +1304,12 @@
> + }
> +
> + start = ped_unit_format (*dev, 0);
> ++ default_unit = ped_unit_get_default ();
> + end = ped_unit_format_byte (*dev, (*dev)->length * (*dev)->sector_size
> +- - 1 );
> ++ - (default_unit == PED_UNIT_CHS || default_unit == PED_UNIT_CYLINDER));
> +
> + if (opt_machine_mode) {
> +- switch (ped_unit_get_default ()) {
> ++ switch (default_unit) {
> + case PED_UNIT_CHS: puts ("CHS;");
> + break;
> + case PED_UNIT_CYLINDER: puts ("CYL;");
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
> new file mode 100644
> index 0000000..0366977
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
> @@ -0,0 +1,12 @@
> +--- parted-1.8.6/libparted/labels/dos.c.boundary 2007-03-13 13:01:09.000000000 -0400
> ++++ parted-1.8.6/libparted/labels/dos.c 2007-04-11 14:56:54.000000000 -0400
> +@@ -1696,8 +1696,7 @@
> + _primary_start_constraint (disk, part,
> + bios_geom, min_geom)));
> +
> +- if (!solution)
> +- solution = _best_solution (part, bios_geom, solution,
> ++ solution = _best_solution (part, bios_geom, solution,
> + _try_constraint (part, constraint,
> + _primary_constraint (disk, bios_geom,
> + min_geom)));
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
> new file mode 100644
> index 0000000..17ec29a
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
> @@ -0,0 +1,50 @@
> +diff -up parted-1.8.6/libparted/arch/linux.c.xvd parted-1.8.6/libparted/arch/linux.c
> +--- parted-1.8.6/libparted/arch/linux.c.xvd 2007-08-07 14:05:59.000000000 -0400
> ++++ parted-1.8.6/libparted/arch/linux.c 2007-08-07 14:07:13.000000000 -0400
> +@@ -248,6 +248,7 @@ struct blkdev_ioctl_param {
> + #define VIODASD_MAJOR 112
> + #define SX8_MAJOR1 160
> + #define SX8_MAJOR2 161
> ++#define XVD_MAJOR 202
> +
> + #define SCSI_BLK_MAJOR(M) ( \
> + (M) == SCSI_DISK0_MAJOR \
> +@@ -450,6 +451,8 @@ _device_probe_type (PedDevice* dev)
> + } else if (_is_dm_major(dev_major)) {
> + dev->type = PED_DEVICE_DM;
> + #endif
> ++ } else if (dev_major == XVD_MAJOR && (dev_minor % 0x10 == 0)) {
> ++ dev->type = PED_DEVICE_XVD;
> + } else {
> + dev->type = PED_DEVICE_UNKNOWN;
> + }
> +@@ -1152,6 +1155,11 @@ linux_new (const char* path)
> + break;
> + #endif
> +
> ++ case PED_DEVICE_XVD:
> ++ if (!init_generic (dev, _("Xen Virtual Block Device")))
> ++ goto error_free_arch_specific;
> ++ break;
> ++
> + case PED_DEVICE_UNKNOWN:
> + if (!init_generic (dev, _("Unknown")))
> + goto error_free_arch_specific;
> +diff -up parted-1.8.6/include/parted/device.h.xvd parted-1.8.6/include/parted/device.h
> +--- parted-1.8.6/include/parted/device.h.xvd 2007-01-12 10:15:10.000000000 -0500
> ++++ parted-1.8.6/include/parted/device.h 2007-08-07 14:07:13.000000000 -0400
> +@@ -45,11 +45,11 @@ typedef enum {
> + PED_DEVICE_UBD = 8,
> + PED_DEVICE_DASD = 9,
> + PED_DEVICE_VIODASD = 10,
> +- PED_DEVICE_SX8 = 11
> ++ PED_DEVICE_SX8 = 11,
> + #ifdef ENABLE_DEVICE_MAPPER
> +- ,
> +- PED_DEVICE_DM = 12
> ++ PED_DEVICE_DM = 12,
> + #endif
> ++ PED_DEVICE_XVD = 13
> + } PedDeviceType;
> +
> + typedef struct _PedDevice PedDevice;
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
> new file mode 100644
> index 0000000..536a20d
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
> @@ -0,0 +1,13 @@
> +diff -up parted-1.8.6/include/parted/device.h.devmapper parted-1.8.6/include/parted/device.h
> +--- parted-1.8.6/include/parted/device.h.devmapper 2007-10-04 15:39:27.000000000 -0400
> ++++ parted-1.8.6/include/parted/device.h 2007-10-04 15:40:11.000000000 -0400
> +@@ -46,9 +46,7 @@ typedef enum {
> + PED_DEVICE_DASD = 9,
> + PED_DEVICE_VIODASD = 10,
> + PED_DEVICE_SX8 = 11,
> +-#ifdef ENABLE_DEVICE_MAPPER
> + PED_DEVICE_DM = 12,
> +-#endif
> + PED_DEVICE_XVD = 13
> + } PedDeviceType;
> +
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
> new file mode 100644
> index 0000000..033f3f5
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
> @@ -0,0 +1,11 @@
> +--- parted-1.8.6/parted/table.c 2010-11-02 13:37:16.256204798 +0900
> ++++ parted-1.8.6/parted/table.c 2010-11-02 13:45:16.231266752 +0900
> +@@ -43,7 +43,7 @@
> + # define wcslen strlen
> + # define wcswidth strnlen
> + # define wcscat strcat
> +-# define wcsdup strdup
> ++/* # define wcsdup strdup */
> + size_t strnlen (const char *, size_t);
> + #endif
> +
> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
> new file mode 100644
> index 0000000..777fe6a
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
> @@ -0,0 +1,26 @@
> +From 4f4dfd5aabdaadd8f495e193ca8daed5a3a1782a Mon Sep 17 00:00:00 2001
> +From: Li xin <lixin.fnst@cn.fujitsu.com>
> +Date: Fri, 28 Nov 2014 02:49:19 +0900
> +Subject: [PATCH] parted/ui.c : fix build error
> +
> +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> +---
> + parted/ui.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/parted/ui.c b/parted/ui.c
> +index 59cb98b..b583693 100644
> +--- a/parted/ui.c
> ++++ b/parted/ui.c
> +@@ -1376,7 +1376,7 @@ init_ui ()
> +
> + #ifdef HAVE_LIBREADLINE
> + rl_initialize ();
> +- rl_attempted_completion_function = (CPPFunction*) complete_function;
> ++ rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
> + readline_state.in_readline = 0;
> + #endif
> +
> +--
> +1.8.4.2
> +
> diff --git a/meta-oe/recipes-extended/parted/parted_1.8.6.bb b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
> new file mode 100644
> index 0000000..537978f
> --- /dev/null
> +++ b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
> @@ -0,0 +1,62 @@
> +SUMMARY = "The GNU disk partition manipulation program"
> +DESCRIPTION = "The GNU Parted program allows you to create, destroy, resize, move, \
> +and copy hard disk partitions. Parted can be used for creating space \
> +for new operating systems, reorganizing disk usage, and copying data \
> +to new hard disks."
> +HOMEPAGE = "http://www.gnu.org/software/parted"
> +SECTION = "Applications/System"
> +
> +SRC_URI = "http://ftp.gnu.org/gnu/parted/parted-1.8.6.tar.bz2 \
> + file://1000parted-1.8.6-warnings1.patch \
> + file://1001parted-1.8.6-notransname1.patch \
> + file://1002parted-1.8.6-off-by-one1.patch \
> + file://1003parted-1.8.6-primary-boundary1.patch \
> + file://1004parted-1.8.6-xvd1.patch \
> + file://1005parted-1.8.6-devmapper-header1.patch \
> + file://7000no_effect_macro1.patch \
> + file://ui.c-fix-build-error.patch \
> + "
> +
> +SRC_URI[md5sum] = "03c967ae0e915e08da90605d68ba93d7"
> +SRC_URI[sha256sum] = "82d94c9bb58cccd1eacfc5ff3a9331d179cc26d8fbe00c451e2c84feb6d23408"
> +
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
> +
> +inherit autotools gettext pkgconfig
> +
> +DEPENDS = "lvm2 readline"
> +
> +EXTRA_OECONF = "--enable-device-mapper \
> + --disable-selinux \
> + --disable-static \
> + --sbindir=${sbindir} \
> + --disable-Werror \
> + --disable-rpath \
> + "
> +EXTRA_OEMAKE = "DESTDIR=${D}"
> +
> +do_configure_prepend() {
> + # ltmain.sh will set rpath to path on host.
> + for l in `find ${S} -name "ltmain\.sh"` ; do
> + sed -i -e 's/\$compile_rpath//g' \
> + -e 's/\$finalize_rpath//g' ${l}
> + done
> +
> + # FIXME: Some option may be needed by EXTRA_OECONF.
> + sed -i 's/ac_cv_func_malloc_0_nonnull=no/ac_cv_func_malloc_0_nonnull=yes/g' ${S}/configure
> + sed -i 's/ac_cv_func_calloc_0_nonnull=no/ac_cv_func_calloc_0_nonnull=yes/g' ${S}/configure
> + sed -i 's/ac_cv_func_memcmp_working=no/ac_cv_func_memcmp_working=yes/g' ${S}/configure
> + sed -i 's/ac_cv_func_realloc_0_nonnull=no/ac_cv_func_realloc_0_nonnull=yes/g' ${S}/configure
> +}
> +
> +do_configure() {
> + oe_runconf
> +}
> +
> +do_install_append() {
> + /bin/rm -rf ${D}/${libdir}/*.la
> + /bin/rm -rf ${D}/usr/share/info/dir
> + /bin/rm -fr ${D}/usr/bin
> +}
> +
> --
> 1.8.4.2
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-08-31 17:58 ` Martin Jansa
@ 2015-08-31 19:11 ` Andre McCurdy
2015-08-31 19:35 ` Martin Jansa
2015-08-31 19:38 ` Andreas Müller
0 siblings, 2 replies; 22+ messages in thread
From: Andre McCurdy @ 2015-08-31 19:11 UTC (permalink / raw)
To: openembedded-devel
On Mon, Aug 31, 2015 at 10:58 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Mon, Jul 06, 2015 at 09:51:34AM +0800, Lei Maohui wrote:
>> In oe-core,the parted is GPLv3,so add parted-1.8.6 which is not GPLv3.
>>
>> Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
>> ---
>> .../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 11 ++++
>> .../1001parted-1.8.6-notransname1.patch | 39 ++++++++++++++
>> .../1002parted-1.8.6-off-by-one1.patch | 25 +++++++++
>> .../1003parted-1.8.6-primary-boundary1.patch | 12 +++++
>> .../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 50 +++++++++++++++++
>> .../1005parted-1.8.6-devmapper-header1.patch | 13 +++++
>> .../parted/parted-1.8.6/7000no_effect_macro1.patch | 11 ++++
>> .../parted/parted-1.8.6/ui.c-fix-build-error.patch | 26 +++++++++
>> meta-oe/recipes-extended/parted/parted_1.8.6.bb | 62 ++++++++++++++++++++++
>> 9 files changed, 249 insertions(+)
>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
>> create mode 100644 meta-oe/recipes-extended/parted/parted_1.8.6.bb
>
> I cannot take this to meta-oe, because as soon as it's added there it
> will be used by all DISTROs even those who don't mind having GPLv3
> version.
>
> Everybody would need to define PREFERRED_VERSION, because
> DEFAULT_PREFERENCE is useless across different layers :/
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2964
>
> So this either has to be introduced in oe-core or in completely separate
> layer which would be included only by those who cannot use GPLv3.
Third option would be to reduce the priority of meta-oe to be lower
than oe-core.
That seems logical regardless of any GPLv3 discussion - since meta-oe
"fills in the gaps" in oe-core, if something _is_ present in oe-core
then it probably should be the default version.
>
>>
>> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
>> new file mode 100644
>> index 0000000..c8b2e7d
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
>> @@ -0,0 +1,11 @@
>> +--- parted-1.8.6/libparted/fs/linux_swap/linux_swap.c.warnings 2007-03-20 13:22:36.000000000 -0400
>> ++++ parted-1.8.6/libparted/fs/linux_swap/linux_swap.c 2007-03-20 13:59:11.000000000 -0400
>> +@@ -123,7 +123,7 @@
>> +
>> + error_close_fs:
>> + swap_close (fs);
>> +-error:
>> ++
>> + return 0;
>> + }
>> + #endif /* !DISCOVER_ONLY */
>> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
>> new file mode 100644
>> index 0000000..5fdf10b
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
>> @@ -0,0 +1,39 @@
>> +--- parted-1.8.6/parted/parted.c.notransname 2007-03-13 13:01:09.000000000 -0400
>> ++++ parted-1.8.6/parted/parted.c 2007-03-21 10:50:35.000000000 -0400
>> +@@ -1429,7 +1429,7 @@
>> + part->fs_type->name : "");
>> +
>> + if (has_name) {
>> +- name = _(ped_partition_get_name (part));
>> ++ name = ped_partition_get_name (part);
>> + str_list_append (row, name);
>> + }
>> +
>> +--- parted-1.8.6/parted/table.c.notransname 2007-03-13 13:01:09.000000000 -0400
>> ++++ parted-1.8.6/parted/table.c 2007-03-21 10:51:31.000000000 -0400
>> +@@ -191,7 +191,8 @@
>> + len += wcslen(COLSUFFIX);
>> +
>> + newsize = (wcslen(*s) + len + 1) * sizeof(wchar_t);
>> +- *s = realloc (*s, newsize);
>> ++ *s = (wchar_t *) realloc (*s, newsize);
>> ++ assert(*s != NULL);
>> +
>> + for (i = 0; i < ncols; ++i)
>> + {
>> +@@ -199,6 +200,7 @@
>> + int nspaces = max(t->widths[i] - wcswidth(row[i], MAX_WIDTH),
>> + 0);
>> + wchar_t* pad = malloc ( (nspaces + 1) * sizeof(wchar_t) );
>> ++ assert(pad != NULL);
>> +
>> + for (j = 0; j < nspaces; ++j)
>> + pad[j] = L' ';
>> +@@ -211,6 +213,7 @@
>> + wcscat (*s, DELIMITER);
>> +
>> + free (pad);
>> ++ pad = NULL;
>> + }
>> +
>> + wcscat (*s, COLSUFFIX);
>> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
>> new file mode 100644
>> index 0000000..9652a98
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
>> @@ -0,0 +1,25 @@
>> +--- parted-1.8.6/parted/parted.c.offbyone 2007-04-11 12:13:06.000000000 -0400
>> ++++ parted-1.8.6/parted/parted.c 2007-04-11 12:13:21.000000000 -0400
>> +@@ -1217,6 +1217,7 @@
>> + static int
>> + do_print (PedDevice** dev)
>> + {
>> ++ PedUnit default_unit;
>> + PedDisk* disk;
>> + Table* table;
>> + StrList* row;
>> +@@ -1303,11 +1304,12 @@
>> + }
>> +
>> + start = ped_unit_format (*dev, 0);
>> ++ default_unit = ped_unit_get_default ();
>> + end = ped_unit_format_byte (*dev, (*dev)->length * (*dev)->sector_size
>> +- - 1 );
>> ++ - (default_unit == PED_UNIT_CHS || default_unit == PED_UNIT_CYLINDER));
>> +
>> + if (opt_machine_mode) {
>> +- switch (ped_unit_get_default ()) {
>> ++ switch (default_unit) {
>> + case PED_UNIT_CHS: puts ("CHS;");
>> + break;
>> + case PED_UNIT_CYLINDER: puts ("CYL;");
>> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
>> new file mode 100644
>> index 0000000..0366977
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
>> @@ -0,0 +1,12 @@
>> +--- parted-1.8.6/libparted/labels/dos.c.boundary 2007-03-13 13:01:09.000000000 -0400
>> ++++ parted-1.8.6/libparted/labels/dos.c 2007-04-11 14:56:54.000000000 -0400
>> +@@ -1696,8 +1696,7 @@
>> + _primary_start_constraint (disk, part,
>> + bios_geom, min_geom)));
>> +
>> +- if (!solution)
>> +- solution = _best_solution (part, bios_geom, solution,
>> ++ solution = _best_solution (part, bios_geom, solution,
>> + _try_constraint (part, constraint,
>> + _primary_constraint (disk, bios_geom,
>> + min_geom)));
>> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
>> new file mode 100644
>> index 0000000..17ec29a
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
>> @@ -0,0 +1,50 @@
>> +diff -up parted-1.8.6/libparted/arch/linux.c.xvd parted-1.8.6/libparted/arch/linux.c
>> +--- parted-1.8.6/libparted/arch/linux.c.xvd 2007-08-07 14:05:59.000000000 -0400
>> ++++ parted-1.8.6/libparted/arch/linux.c 2007-08-07 14:07:13.000000000 -0400
>> +@@ -248,6 +248,7 @@ struct blkdev_ioctl_param {
>> + #define VIODASD_MAJOR 112
>> + #define SX8_MAJOR1 160
>> + #define SX8_MAJOR2 161
>> ++#define XVD_MAJOR 202
>> +
>> + #define SCSI_BLK_MAJOR(M) ( \
>> + (M) == SCSI_DISK0_MAJOR \
>> +@@ -450,6 +451,8 @@ _device_probe_type (PedDevice* dev)
>> + } else if (_is_dm_major(dev_major)) {
>> + dev->type = PED_DEVICE_DM;
>> + #endif
>> ++ } else if (dev_major == XVD_MAJOR && (dev_minor % 0x10 == 0)) {
>> ++ dev->type = PED_DEVICE_XVD;
>> + } else {
>> + dev->type = PED_DEVICE_UNKNOWN;
>> + }
>> +@@ -1152,6 +1155,11 @@ linux_new (const char* path)
>> + break;
>> + #endif
>> +
>> ++ case PED_DEVICE_XVD:
>> ++ if (!init_generic (dev, _("Xen Virtual Block Device")))
>> ++ goto error_free_arch_specific;
>> ++ break;
>> ++
>> + case PED_DEVICE_UNKNOWN:
>> + if (!init_generic (dev, _("Unknown")))
>> + goto error_free_arch_specific;
>> +diff -up parted-1.8.6/include/parted/device.h.xvd parted-1.8.6/include/parted/device.h
>> +--- parted-1.8.6/include/parted/device.h.xvd 2007-01-12 10:15:10.000000000 -0500
>> ++++ parted-1.8.6/include/parted/device.h 2007-08-07 14:07:13.000000000 -0400
>> +@@ -45,11 +45,11 @@ typedef enum {
>> + PED_DEVICE_UBD = 8,
>> + PED_DEVICE_DASD = 9,
>> + PED_DEVICE_VIODASD = 10,
>> +- PED_DEVICE_SX8 = 11
>> ++ PED_DEVICE_SX8 = 11,
>> + #ifdef ENABLE_DEVICE_MAPPER
>> +- ,
>> +- PED_DEVICE_DM = 12
>> ++ PED_DEVICE_DM = 12,
>> + #endif
>> ++ PED_DEVICE_XVD = 13
>> + } PedDeviceType;
>> +
>> + typedef struct _PedDevice PedDevice;
>> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
>> new file mode 100644
>> index 0000000..536a20d
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
>> @@ -0,0 +1,13 @@
>> +diff -up parted-1.8.6/include/parted/device.h.devmapper parted-1.8.6/include/parted/device.h
>> +--- parted-1.8.6/include/parted/device.h.devmapper 2007-10-04 15:39:27.000000000 -0400
>> ++++ parted-1.8.6/include/parted/device.h 2007-10-04 15:40:11.000000000 -0400
>> +@@ -46,9 +46,7 @@ typedef enum {
>> + PED_DEVICE_DASD = 9,
>> + PED_DEVICE_VIODASD = 10,
>> + PED_DEVICE_SX8 = 11,
>> +-#ifdef ENABLE_DEVICE_MAPPER
>> + PED_DEVICE_DM = 12,
>> +-#endif
>> + PED_DEVICE_XVD = 13
>> + } PedDeviceType;
>> +
>> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
>> new file mode 100644
>> index 0000000..033f3f5
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
>> @@ -0,0 +1,11 @@
>> +--- parted-1.8.6/parted/table.c 2010-11-02 13:37:16.256204798 +0900
>> ++++ parted-1.8.6/parted/table.c 2010-11-02 13:45:16.231266752 +0900
>> +@@ -43,7 +43,7 @@
>> + # define wcslen strlen
>> + # define wcswidth strnlen
>> + # define wcscat strcat
>> +-# define wcsdup strdup
>> ++/* # define wcsdup strdup */
>> + size_t strnlen (const char *, size_t);
>> + #endif
>> +
>> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
>> new file mode 100644
>> index 0000000..777fe6a
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
>> @@ -0,0 +1,26 @@
>> +From 4f4dfd5aabdaadd8f495e193ca8daed5a3a1782a Mon Sep 17 00:00:00 2001
>> +From: Li xin <lixin.fnst@cn.fujitsu.com>
>> +Date: Fri, 28 Nov 2014 02:49:19 +0900
>> +Subject: [PATCH] parted/ui.c : fix build error
>> +
>> +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
>> +---
>> + parted/ui.c | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/parted/ui.c b/parted/ui.c
>> +index 59cb98b..b583693 100644
>> +--- a/parted/ui.c
>> ++++ b/parted/ui.c
>> +@@ -1376,7 +1376,7 @@ init_ui ()
>> +
>> + #ifdef HAVE_LIBREADLINE
>> + rl_initialize ();
>> +- rl_attempted_completion_function = (CPPFunction*) complete_function;
>> ++ rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
>> + readline_state.in_readline = 0;
>> + #endif
>> +
>> +--
>> +1.8.4.2
>> +
>> diff --git a/meta-oe/recipes-extended/parted/parted_1.8.6.bb b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
>> new file mode 100644
>> index 0000000..537978f
>> --- /dev/null
>> +++ b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
>> @@ -0,0 +1,62 @@
>> +SUMMARY = "The GNU disk partition manipulation program"
>> +DESCRIPTION = "The GNU Parted program allows you to create, destroy, resize, move, \
>> +and copy hard disk partitions. Parted can be used for creating space \
>> +for new operating systems, reorganizing disk usage, and copying data \
>> +to new hard disks."
>> +HOMEPAGE = "http://www.gnu.org/software/parted"
>> +SECTION = "Applications/System"
>> +
>> +SRC_URI = "http://ftp.gnu.org/gnu/parted/parted-1.8.6.tar.bz2 \
>> + file://1000parted-1.8.6-warnings1.patch \
>> + file://1001parted-1.8.6-notransname1.patch \
>> + file://1002parted-1.8.6-off-by-one1.patch \
>> + file://1003parted-1.8.6-primary-boundary1.patch \
>> + file://1004parted-1.8.6-xvd1.patch \
>> + file://1005parted-1.8.6-devmapper-header1.patch \
>> + file://7000no_effect_macro1.patch \
>> + file://ui.c-fix-build-error.patch \
>> + "
>> +
>> +SRC_URI[md5sum] = "03c967ae0e915e08da90605d68ba93d7"
>> +SRC_URI[sha256sum] = "82d94c9bb58cccd1eacfc5ff3a9331d179cc26d8fbe00c451e2c84feb6d23408"
>> +
>> +LICENSE = "GPLv2+"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
>> +
>> +inherit autotools gettext pkgconfig
>> +
>> +DEPENDS = "lvm2 readline"
>> +
>> +EXTRA_OECONF = "--enable-device-mapper \
>> + --disable-selinux \
>> + --disable-static \
>> + --sbindir=${sbindir} \
>> + --disable-Werror \
>> + --disable-rpath \
>> + "
>> +EXTRA_OEMAKE = "DESTDIR=${D}"
>> +
>> +do_configure_prepend() {
>> + # ltmain.sh will set rpath to path on host.
>> + for l in `find ${S} -name "ltmain\.sh"` ; do
>> + sed -i -e 's/\$compile_rpath//g' \
>> + -e 's/\$finalize_rpath//g' ${l}
>> + done
>> +
>> + # FIXME: Some option may be needed by EXTRA_OECONF.
>> + sed -i 's/ac_cv_func_malloc_0_nonnull=no/ac_cv_func_malloc_0_nonnull=yes/g' ${S}/configure
>> + sed -i 's/ac_cv_func_calloc_0_nonnull=no/ac_cv_func_calloc_0_nonnull=yes/g' ${S}/configure
>> + sed -i 's/ac_cv_func_memcmp_working=no/ac_cv_func_memcmp_working=yes/g' ${S}/configure
>> + sed -i 's/ac_cv_func_realloc_0_nonnull=no/ac_cv_func_realloc_0_nonnull=yes/g' ${S}/configure
>> +}
>> +
>> +do_configure() {
>> + oe_runconf
>> +}
>> +
>> +do_install_append() {
>> + /bin/rm -rf ${D}/${libdir}/*.la
>> + /bin/rm -rf ${D}/usr/share/info/dir
>> + /bin/rm -fr ${D}/usr/bin
>> +}
>> +
>> --
>> 1.8.4.2
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-08-31 19:11 ` Andre McCurdy
@ 2015-08-31 19:35 ` Martin Jansa
2015-08-31 19:50 ` Andre McCurdy
2015-08-31 19:38 ` Andreas Müller
1 sibling, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2015-08-31 19:35 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 18162 bytes --]
On Mon, Aug 31, 2015 at 12:11:01PM -0700, Andre McCurdy wrote:
> On Mon, Aug 31, 2015 at 10:58 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Mon, Jul 06, 2015 at 09:51:34AM +0800, Lei Maohui wrote:
> >> In oe-core,the parted is GPLv3,so add parted-1.8.6 which is not GPLv3.
> >>
> >> Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
> >> ---
> >> .../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 11 ++++
> >> .../1001parted-1.8.6-notransname1.patch | 39 ++++++++++++++
> >> .../1002parted-1.8.6-off-by-one1.patch | 25 +++++++++
> >> .../1003parted-1.8.6-primary-boundary1.patch | 12 +++++
> >> .../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 50 +++++++++++++++++
> >> .../1005parted-1.8.6-devmapper-header1.patch | 13 +++++
> >> .../parted/parted-1.8.6/7000no_effect_macro1.patch | 11 ++++
> >> .../parted/parted-1.8.6/ui.c-fix-build-error.patch | 26 +++++++++
> >> meta-oe/recipes-extended/parted/parted_1.8.6.bb | 62 ++++++++++++++++++++++
> >> 9 files changed, 249 insertions(+)
> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
> >> create mode 100644 meta-oe/recipes-extended/parted/parted_1.8.6.bb
> >
> > I cannot take this to meta-oe, because as soon as it's added there it
> > will be used by all DISTROs even those who don't mind having GPLv3
> > version.
> >
> > Everybody would need to define PREFERRED_VERSION, because
> > DEFAULT_PREFERENCE is useless across different layers :/
> > https://bugzilla.yoctoproject.org/show_bug.cgi?id=2964
> >
> > So this either has to be introduced in oe-core or in completely separate
> > layer which would be included only by those who cannot use GPLv3.
>
> Third option would be to reduce the priority of meta-oe to be lower
> than oe-core.
>
> That seems logical regardless of any GPLv3 discussion - since meta-oe
> "fills in the gaps" in oe-core, if something _is_ present in oe-core
> then it probably should be the default version.
Except when this additional stuff requires some changes in recipes
already available in oe-core, that's why meta-oe has higher priority.
>
> >
> >>
> >> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
> >> new file mode 100644
> >> index 0000000..c8b2e7d
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
> >> @@ -0,0 +1,11 @@
> >> +--- parted-1.8.6/libparted/fs/linux_swap/linux_swap.c.warnings 2007-03-20 13:22:36.000000000 -0400
> >> ++++ parted-1.8.6/libparted/fs/linux_swap/linux_swap.c 2007-03-20 13:59:11.000000000 -0400
> >> +@@ -123,7 +123,7 @@
> >> +
> >> + error_close_fs:
> >> + swap_close (fs);
> >> +-error:
> >> ++
> >> + return 0;
> >> + }
> >> + #endif /* !DISCOVER_ONLY */
> >> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
> >> new file mode 100644
> >> index 0000000..5fdf10b
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
> >> @@ -0,0 +1,39 @@
> >> +--- parted-1.8.6/parted/parted.c.notransname 2007-03-13 13:01:09.000000000 -0400
> >> ++++ parted-1.8.6/parted/parted.c 2007-03-21 10:50:35.000000000 -0400
> >> +@@ -1429,7 +1429,7 @@
> >> + part->fs_type->name : "");
> >> +
> >> + if (has_name) {
> >> +- name = _(ped_partition_get_name (part));
> >> ++ name = ped_partition_get_name (part);
> >> + str_list_append (row, name);
> >> + }
> >> +
> >> +--- parted-1.8.6/parted/table.c.notransname 2007-03-13 13:01:09.000000000 -0400
> >> ++++ parted-1.8.6/parted/table.c 2007-03-21 10:51:31.000000000 -0400
> >> +@@ -191,7 +191,8 @@
> >> + len += wcslen(COLSUFFIX);
> >> +
> >> + newsize = (wcslen(*s) + len + 1) * sizeof(wchar_t);
> >> +- *s = realloc (*s, newsize);
> >> ++ *s = (wchar_t *) realloc (*s, newsize);
> >> ++ assert(*s != NULL);
> >> +
> >> + for (i = 0; i < ncols; ++i)
> >> + {
> >> +@@ -199,6 +200,7 @@
> >> + int nspaces = max(t->widths[i] - wcswidth(row[i], MAX_WIDTH),
> >> + 0);
> >> + wchar_t* pad = malloc ( (nspaces + 1) * sizeof(wchar_t) );
> >> ++ assert(pad != NULL);
> >> +
> >> + for (j = 0; j < nspaces; ++j)
> >> + pad[j] = L' ';
> >> +@@ -211,6 +213,7 @@
> >> + wcscat (*s, DELIMITER);
> >> +
> >> + free (pad);
> >> ++ pad = NULL;
> >> + }
> >> +
> >> + wcscat (*s, COLSUFFIX);
> >> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
> >> new file mode 100644
> >> index 0000000..9652a98
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
> >> @@ -0,0 +1,25 @@
> >> +--- parted-1.8.6/parted/parted.c.offbyone 2007-04-11 12:13:06.000000000 -0400
> >> ++++ parted-1.8.6/parted/parted.c 2007-04-11 12:13:21.000000000 -0400
> >> +@@ -1217,6 +1217,7 @@
> >> + static int
> >> + do_print (PedDevice** dev)
> >> + {
> >> ++ PedUnit default_unit;
> >> + PedDisk* disk;
> >> + Table* table;
> >> + StrList* row;
> >> +@@ -1303,11 +1304,12 @@
> >> + }
> >> +
> >> + start = ped_unit_format (*dev, 0);
> >> ++ default_unit = ped_unit_get_default ();
> >> + end = ped_unit_format_byte (*dev, (*dev)->length * (*dev)->sector_size
> >> +- - 1 );
> >> ++ - (default_unit == PED_UNIT_CHS || default_unit == PED_UNIT_CYLINDER));
> >> +
> >> + if (opt_machine_mode) {
> >> +- switch (ped_unit_get_default ()) {
> >> ++ switch (default_unit) {
> >> + case PED_UNIT_CHS: puts ("CHS;");
> >> + break;
> >> + case PED_UNIT_CYLINDER: puts ("CYL;");
> >> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
> >> new file mode 100644
> >> index 0000000..0366977
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
> >> @@ -0,0 +1,12 @@
> >> +--- parted-1.8.6/libparted/labels/dos.c.boundary 2007-03-13 13:01:09.000000000 -0400
> >> ++++ parted-1.8.6/libparted/labels/dos.c 2007-04-11 14:56:54.000000000 -0400
> >> +@@ -1696,8 +1696,7 @@
> >> + _primary_start_constraint (disk, part,
> >> + bios_geom, min_geom)));
> >> +
> >> +- if (!solution)
> >> +- solution = _best_solution (part, bios_geom, solution,
> >> ++ solution = _best_solution (part, bios_geom, solution,
> >> + _try_constraint (part, constraint,
> >> + _primary_constraint (disk, bios_geom,
> >> + min_geom)));
> >> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
> >> new file mode 100644
> >> index 0000000..17ec29a
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
> >> @@ -0,0 +1,50 @@
> >> +diff -up parted-1.8.6/libparted/arch/linux.c.xvd parted-1.8.6/libparted/arch/linux.c
> >> +--- parted-1.8.6/libparted/arch/linux.c.xvd 2007-08-07 14:05:59.000000000 -0400
> >> ++++ parted-1.8.6/libparted/arch/linux.c 2007-08-07 14:07:13.000000000 -0400
> >> +@@ -248,6 +248,7 @@ struct blkdev_ioctl_param {
> >> + #define VIODASD_MAJOR 112
> >> + #define SX8_MAJOR1 160
> >> + #define SX8_MAJOR2 161
> >> ++#define XVD_MAJOR 202
> >> +
> >> + #define SCSI_BLK_MAJOR(M) ( \
> >> + (M) == SCSI_DISK0_MAJOR \
> >> +@@ -450,6 +451,8 @@ _device_probe_type (PedDevice* dev)
> >> + } else if (_is_dm_major(dev_major)) {
> >> + dev->type = PED_DEVICE_DM;
> >> + #endif
> >> ++ } else if (dev_major == XVD_MAJOR && (dev_minor % 0x10 == 0)) {
> >> ++ dev->type = PED_DEVICE_XVD;
> >> + } else {
> >> + dev->type = PED_DEVICE_UNKNOWN;
> >> + }
> >> +@@ -1152,6 +1155,11 @@ linux_new (const char* path)
> >> + break;
> >> + #endif
> >> +
> >> ++ case PED_DEVICE_XVD:
> >> ++ if (!init_generic (dev, _("Xen Virtual Block Device")))
> >> ++ goto error_free_arch_specific;
> >> ++ break;
> >> ++
> >> + case PED_DEVICE_UNKNOWN:
> >> + if (!init_generic (dev, _("Unknown")))
> >> + goto error_free_arch_specific;
> >> +diff -up parted-1.8.6/include/parted/device.h.xvd parted-1.8.6/include/parted/device.h
> >> +--- parted-1.8.6/include/parted/device.h.xvd 2007-01-12 10:15:10.000000000 -0500
> >> ++++ parted-1.8.6/include/parted/device.h 2007-08-07 14:07:13.000000000 -0400
> >> +@@ -45,11 +45,11 @@ typedef enum {
> >> + PED_DEVICE_UBD = 8,
> >> + PED_DEVICE_DASD = 9,
> >> + PED_DEVICE_VIODASD = 10,
> >> +- PED_DEVICE_SX8 = 11
> >> ++ PED_DEVICE_SX8 = 11,
> >> + #ifdef ENABLE_DEVICE_MAPPER
> >> +- ,
> >> +- PED_DEVICE_DM = 12
> >> ++ PED_DEVICE_DM = 12,
> >> + #endif
> >> ++ PED_DEVICE_XVD = 13
> >> + } PedDeviceType;
> >> +
> >> + typedef struct _PedDevice PedDevice;
> >> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
> >> new file mode 100644
> >> index 0000000..536a20d
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
> >> @@ -0,0 +1,13 @@
> >> +diff -up parted-1.8.6/include/parted/device.h.devmapper parted-1.8.6/include/parted/device.h
> >> +--- parted-1.8.6/include/parted/device.h.devmapper 2007-10-04 15:39:27.000000000 -0400
> >> ++++ parted-1.8.6/include/parted/device.h 2007-10-04 15:40:11.000000000 -0400
> >> +@@ -46,9 +46,7 @@ typedef enum {
> >> + PED_DEVICE_DASD = 9,
> >> + PED_DEVICE_VIODASD = 10,
> >> + PED_DEVICE_SX8 = 11,
> >> +-#ifdef ENABLE_DEVICE_MAPPER
> >> + PED_DEVICE_DM = 12,
> >> +-#endif
> >> + PED_DEVICE_XVD = 13
> >> + } PedDeviceType;
> >> +
> >> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
> >> new file mode 100644
> >> index 0000000..033f3f5
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
> >> @@ -0,0 +1,11 @@
> >> +--- parted-1.8.6/parted/table.c 2010-11-02 13:37:16.256204798 +0900
> >> ++++ parted-1.8.6/parted/table.c 2010-11-02 13:45:16.231266752 +0900
> >> +@@ -43,7 +43,7 @@
> >> + # define wcslen strlen
> >> + # define wcswidth strnlen
> >> + # define wcscat strcat
> >> +-# define wcsdup strdup
> >> ++/* # define wcsdup strdup */
> >> + size_t strnlen (const char *, size_t);
> >> + #endif
> >> +
> >> diff --git a/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
> >> new file mode 100644
> >> index 0000000..777fe6a
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
> >> @@ -0,0 +1,26 @@
> >> +From 4f4dfd5aabdaadd8f495e193ca8daed5a3a1782a Mon Sep 17 00:00:00 2001
> >> +From: Li xin <lixin.fnst@cn.fujitsu.com>
> >> +Date: Fri, 28 Nov 2014 02:49:19 +0900
> >> +Subject: [PATCH] parted/ui.c : fix build error
> >> +
> >> +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> >> +---
> >> + parted/ui.c | 2 +-
> >> + 1 file changed, 1 insertion(+), 1 deletion(-)
> >> +
> >> +diff --git a/parted/ui.c b/parted/ui.c
> >> +index 59cb98b..b583693 100644
> >> +--- a/parted/ui.c
> >> ++++ b/parted/ui.c
> >> +@@ -1376,7 +1376,7 @@ init_ui ()
> >> +
> >> + #ifdef HAVE_LIBREADLINE
> >> + rl_initialize ();
> >> +- rl_attempted_completion_function = (CPPFunction*) complete_function;
> >> ++ rl_attempted_completion_function = (rl_completion_func_t*) complete_function;
> >> + readline_state.in_readline = 0;
> >> + #endif
> >> +
> >> +--
> >> +1.8.4.2
> >> +
> >> diff --git a/meta-oe/recipes-extended/parted/parted_1.8.6.bb b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
> >> new file mode 100644
> >> index 0000000..537978f
> >> --- /dev/null
> >> +++ b/meta-oe/recipes-extended/parted/parted_1.8.6.bb
> >> @@ -0,0 +1,62 @@
> >> +SUMMARY = "The GNU disk partition manipulation program"
> >> +DESCRIPTION = "The GNU Parted program allows you to create, destroy, resize, move, \
> >> +and copy hard disk partitions. Parted can be used for creating space \
> >> +for new operating systems, reorganizing disk usage, and copying data \
> >> +to new hard disks."
> >> +HOMEPAGE = "http://www.gnu.org/software/parted"
> >> +SECTION = "Applications/System"
> >> +
> >> +SRC_URI = "http://ftp.gnu.org/gnu/parted/parted-1.8.6.tar.bz2 \
> >> + file://1000parted-1.8.6-warnings1.patch \
> >> + file://1001parted-1.8.6-notransname1.patch \
> >> + file://1002parted-1.8.6-off-by-one1.patch \
> >> + file://1003parted-1.8.6-primary-boundary1.patch \
> >> + file://1004parted-1.8.6-xvd1.patch \
> >> + file://1005parted-1.8.6-devmapper-header1.patch \
> >> + file://7000no_effect_macro1.patch \
> >> + file://ui.c-fix-build-error.patch \
> >> + "
> >> +
> >> +SRC_URI[md5sum] = "03c967ae0e915e08da90605d68ba93d7"
> >> +SRC_URI[sha256sum] = "82d94c9bb58cccd1eacfc5ff3a9331d179cc26d8fbe00c451e2c84feb6d23408"
> >> +
> >> +LICENSE = "GPLv2+"
> >> +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
> >> +
> >> +inherit autotools gettext pkgconfig
> >> +
> >> +DEPENDS = "lvm2 readline"
> >> +
> >> +EXTRA_OECONF = "--enable-device-mapper \
> >> + --disable-selinux \
> >> + --disable-static \
> >> + --sbindir=${sbindir} \
> >> + --disable-Werror \
> >> + --disable-rpath \
> >> + "
> >> +EXTRA_OEMAKE = "DESTDIR=${D}"
> >> +
> >> +do_configure_prepend() {
> >> + # ltmain.sh will set rpath to path on host.
> >> + for l in `find ${S} -name "ltmain\.sh"` ; do
> >> + sed -i -e 's/\$compile_rpath//g' \
> >> + -e 's/\$finalize_rpath//g' ${l}
> >> + done
> >> +
> >> + # FIXME: Some option may be needed by EXTRA_OECONF.
> >> + sed -i 's/ac_cv_func_malloc_0_nonnull=no/ac_cv_func_malloc_0_nonnull=yes/g' ${S}/configure
> >> + sed -i 's/ac_cv_func_calloc_0_nonnull=no/ac_cv_func_calloc_0_nonnull=yes/g' ${S}/configure
> >> + sed -i 's/ac_cv_func_memcmp_working=no/ac_cv_func_memcmp_working=yes/g' ${S}/configure
> >> + sed -i 's/ac_cv_func_realloc_0_nonnull=no/ac_cv_func_realloc_0_nonnull=yes/g' ${S}/configure
> >> +}
> >> +
> >> +do_configure() {
> >> + oe_runconf
> >> +}
> >> +
> >> +do_install_append() {
> >> + /bin/rm -rf ${D}/${libdir}/*.la
> >> + /bin/rm -rf ${D}/usr/share/info/dir
> >> + /bin/rm -fr ${D}/usr/bin
> >> +}
> >> +
> >> --
> >> 1.8.4.2
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> > --
> > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> >
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-08-31 19:11 ` Andre McCurdy
2015-08-31 19:35 ` Martin Jansa
@ 2015-08-31 19:38 ` Andreas Müller
2015-08-31 20:02 ` Andre McCurdy
1 sibling, 1 reply; 22+ messages in thread
From: Andreas Müller @ 2015-08-31 19:38 UTC (permalink / raw)
To: openembedded-devel@lists.openembedded.org
On Mon, Aug 31, 2015 at 9:11 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> On Mon, Aug 31, 2015 at 10:58 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> On Mon, Jul 06, 2015 at 09:51:34AM +0800, Lei Maohui wrote:
>>> In oe-core,the parted is GPLv3,so add parted-1.8.6 which is not GPLv3.
>>>
>>> Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
>>> ---
>>> .../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 11 ++++
>>> .../1001parted-1.8.6-notransname1.patch | 39 ++++++++++++++
>>> .../1002parted-1.8.6-off-by-one1.patch | 25 +++++++++
>>> .../1003parted-1.8.6-primary-boundary1.patch | 12 +++++
>>> .../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 50 +++++++++++++++++
>>> .../1005parted-1.8.6-devmapper-header1.patch | 13 +++++
>>> .../parted/parted-1.8.6/7000no_effect_macro1.patch | 11 ++++
>>> .../parted/parted-1.8.6/ui.c-fix-build-error.patch | 26 +++++++++
>>> meta-oe/recipes-extended/parted/parted_1.8.6.bb | 62 ++++++++++++++++++++++
>>> 9 files changed, 249 insertions(+)
>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
>>> create mode 100644 meta-oe/recipes-extended/parted/parted_1.8.6.bb
>>
>> I cannot take this to meta-oe, because as soon as it's added there it
>> will be used by all DISTROs even those who don't mind having GPLv3
>> version.
>>
>> Everybody would need to define PREFERRED_VERSION, because
>> DEFAULT_PREFERENCE is useless across different layers :/
>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2964
>>
>> So this either has to be introduced in oe-core or in completely separate
>> layer which would be included only by those who cannot use GPLv3.
>
> Third option would be to reduce the priority of meta-oe to be lower
> than oe-core.
>
> That seems logical regardless of any GPLv3 discussion - since meta-oe
> "fills in the gaps" in oe-core, if something _is_ present in oe-core
> then it probably should be the default version.
>
This scares me: to get a recipe in with old version not supporting
modern file systems you want to change meta-oe's layer priority
risiking unknown issues. I wonder how far the GPLv3 avoidance hype
takes us...
Andreas
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-08-31 19:35 ` Martin Jansa
@ 2015-08-31 19:50 ` Andre McCurdy
0 siblings, 0 replies; 22+ messages in thread
From: Andre McCurdy @ 2015-08-31 19:50 UTC (permalink / raw)
To: openembedded-devel
On Mon, Aug 31, 2015 at 12:35 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Mon, Aug 31, 2015 at 12:11:01PM -0700, Andre McCurdy wrote:
>> On Mon, Aug 31, 2015 at 10:58 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > On Mon, Jul 06, 2015 at 09:51:34AM +0800, Lei Maohui wrote:
>> >> In oe-core,the parted is GPLv3,so add parted-1.8.6 which is not GPLv3.
>> >>
>> >> Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
>> >> ---
>> >> .../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 11 ++++
>> >> .../1001parted-1.8.6-notransname1.patch | 39 ++++++++++++++
>> >> .../1002parted-1.8.6-off-by-one1.patch | 25 +++++++++
>> >> .../1003parted-1.8.6-primary-boundary1.patch | 12 +++++
>> >> .../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 50 +++++++++++++++++
>> >> .../1005parted-1.8.6-devmapper-header1.patch | 13 +++++
>> >> .../parted/parted-1.8.6/7000no_effect_macro1.patch | 11 ++++
>> >> .../parted/parted-1.8.6/ui.c-fix-build-error.patch | 26 +++++++++
>> >> meta-oe/recipes-extended/parted/parted_1.8.6.bb | 62 ++++++++++++++++++++++
>> >> 9 files changed, 249 insertions(+)
>> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
>> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
>> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
>> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
>> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
>> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
>> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
>> >> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
>> >> create mode 100644 meta-oe/recipes-extended/parted/parted_1.8.6.bb
>> >
>> > I cannot take this to meta-oe, because as soon as it's added there it
>> > will be used by all DISTROs even those who don't mind having GPLv3
>> > version.
>> >
>> > Everybody would need to define PREFERRED_VERSION, because
>> > DEFAULT_PREFERENCE is useless across different layers :/
>> > https://bugzilla.yoctoproject.org/show_bug.cgi?id=2964
>> >
>> > So this either has to be introduced in oe-core or in completely separate
>> > layer which would be included only by those who cannot use GPLv3.
>>
>> Third option would be to reduce the priority of meta-oe to be lower
>> than oe-core.
>>
>> That seems logical regardless of any GPLv3 discussion - since meta-oe
>> "fills in the gaps" in oe-core, if something _is_ present in oe-core
>> then it probably should be the default version.
>
> Except when this additional stuff requires some changes in recipes
> already available in oe-core, that's why meta-oe has higher priority.
>
Do you have an example?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-08-31 19:38 ` Andreas Müller
@ 2015-08-31 20:02 ` Andre McCurdy
2015-09-01 6:36 ` Anders Darander
0 siblings, 1 reply; 22+ messages in thread
From: Andre McCurdy @ 2015-08-31 20:02 UTC (permalink / raw)
To: openembedded-devel
On Mon, Aug 31, 2015 at 12:38 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Mon, Aug 31, 2015 at 9:11 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
>> On Mon, Aug 31, 2015 at 10:58 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>>> On Mon, Jul 06, 2015 at 09:51:34AM +0800, Lei Maohui wrote:
>>>> In oe-core,the parted is GPLv3,so add parted-1.8.6 which is not GPLv3.
>>>>
>>>> Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
>>>> ---
>>>> .../parted-1.8.6/1000parted-1.8.6-warnings1.patch | 11 ++++
>>>> .../1001parted-1.8.6-notransname1.patch | 39 ++++++++++++++
>>>> .../1002parted-1.8.6-off-by-one1.patch | 25 +++++++++
>>>> .../1003parted-1.8.6-primary-boundary1.patch | 12 +++++
>>>> .../parted-1.8.6/1004parted-1.8.6-xvd1.patch | 50 +++++++++++++++++
>>>> .../1005parted-1.8.6-devmapper-header1.patch | 13 +++++
>>>> .../parted/parted-1.8.6/7000no_effect_macro1.patch | 11 ++++
>>>> .../parted/parted-1.8.6/ui.c-fix-build-error.patch | 26 +++++++++
>>>> meta-oe/recipes-extended/parted/parted_1.8.6.bb | 62 ++++++++++++++++++++++
>>>> 9 files changed, 249 insertions(+)
>>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1000parted-1.8.6-warnings1.patch
>>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1001parted-1.8.6-notransname1.patch
>>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1002parted-1.8.6-off-by-one1.patch
>>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1003parted-1.8.6-primary-boundary1.patch
>>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1004parted-1.8.6-xvd1.patch
>>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/1005parted-1.8.6-devmapper-header1.patch
>>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/7000no_effect_macro1.patch
>>>> create mode 100644 meta-oe/recipes-extended/parted/parted-1.8.6/ui.c-fix-build-error.patch
>>>> create mode 100644 meta-oe/recipes-extended/parted/parted_1.8.6.bb
>>>
>>> I cannot take this to meta-oe, because as soon as it's added there it
>>> will be used by all DISTROs even those who don't mind having GPLv3
>>> version.
>>>
>>> Everybody would need to define PREFERRED_VERSION, because
>>> DEFAULT_PREFERENCE is useless across different layers :/
>>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2964
>>>
>>> So this either has to be introduced in oe-core or in completely separate
>>> layer which would be included only by those who cannot use GPLv3.
>>
>> Third option would be to reduce the priority of meta-oe to be lower
>> than oe-core.
>>
>> That seems logical regardless of any GPLv3 discussion - since meta-oe
>> "fills in the gaps" in oe-core, if something _is_ present in oe-core
>> then it probably should be the default version.
>>
> This scares me: to get a recipe in with old version not supporting
> modern file systems you want to change meta-oe's layer priority
> risiking unknown issues. I wonder how far the GPLv3 avoidance hype
> takes us...
No, if you read the various threads, my preference is to have the
GPLv2 parted recipe in oe-core. That option has been shot down though
and the general consensus seems to be that the older version of parted
is too buggy to be included anywhere in OE. That topic seems to be
closed.
Trying to understand why meta-oe needs a higher priority than oe-core
is a separate topic. If the priorities were changed it would allow
older (and newer) versions of oe-core recipes to safely live in
meta-oe. That would help non-GPLv3 versions of GPLv3 packages, but it
might be useful in other cases too.
> Andreas
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-08-31 20:02 ` Andre McCurdy
@ 2015-09-01 6:36 ` Anders Darander
2015-09-01 21:57 ` Andre McCurdy
0 siblings, 1 reply; 22+ messages in thread
From: Anders Darander @ 2015-09-01 6:36 UTC (permalink / raw)
To: openembedded-devel
* Andre McCurdy <armccurdy@gmail.com> [150831 22:03]:
> On Mon, Aug 31, 2015 at 12:38 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
> > On Mon, Aug 31, 2015 at 9:11 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> >> On Mon, Aug 31, 2015 at 10:58 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >>> I cannot take this to meta-oe, because as soon as it's added there it
> >>> will be used by all DISTROs even those who don't mind having GPLv3
> >>> version.
> >>> Everybody would need to define PREFERRED_VERSION, because
> >>> DEFAULT_PREFERENCE is useless across different layers :/
> >>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2964
> >>> So this either has to be introduced in oe-core or in completely separate
> >>> layer which would be included only by those who cannot use GPLv3.
I think that the correct way to handle those recipes (that isn't core
enough to be kept in oe-core) is to create a new layer, maybe meta-gplv2
or meta-nongplv3; dependig on how explicit the naming should be. This
layer could very well be put in meta-openembedded (the meta layer, not
meta-oe).
> >> Third option would be to reduce the priority of meta-oe to be lower
> >> than oe-core.
> >> That seems logical regardless of any GPLv3 discussion - since meta-oe
> >> "fills in the gaps" in oe-core, if something _is_ present in oe-core
> >> then it probably should be the default version.
> > This scares me: to get a recipe in with old version not supporting
> > modern file systems you want to change meta-oe's layer priority
> > risiking unknown issues. I wonder how far the GPLv3 avoidance hype
> > takes us...
> No, if you read the various threads, my preference is to have the
> GPLv2 parted recipe in oe-core. That option has been shot down though
> and the general consensus seems to be that the older version of parted
> is too buggy to be included anywhere in OE. That topic seems to be
> closed.
> Trying to understand why meta-oe needs a higher priority than oe-core
> is a separate topic. If the priorities were changed it would allow
> older (and newer) versions of oe-core recipes to safely live in
> meta-oe. That would help non-GPLv3 versions of GPLv3 packages, but it
> might be useful in other cases too.
Well, changing the priority might have effects on peoples current
builds; most likely effects that you don't anticipate during an upgrade.
And at least periodically, meta-oe has modified how recipes from oe-core
has been built. Thus, the need for a higher priority of meta-oe as
compared to oe-core. (I know that I've had to undo such changes in my
own layers in older releases).
Cheers,
Anders
--
Anders Darander
ChargeStorm AB / eStorm AB
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-09-01 6:36 ` Anders Darander
@ 2015-09-01 21:57 ` Andre McCurdy
2015-09-01 22:07 ` Martin Jansa
0 siblings, 1 reply; 22+ messages in thread
From: Andre McCurdy @ 2015-09-01 21:57 UTC (permalink / raw)
To: openembedded-devel
On Mon, Aug 31, 2015 at 11:36 PM, Anders Darander <anders@chargestorm.se> wrote:
> * Andre McCurdy <armccurdy@gmail.com> [150831 22:03]:
>
>> On Mon, Aug 31, 2015 at 12:38 PM, Andreas Müller
>> <schnitzeltony@googlemail.com> wrote:
>> > On Mon, Aug 31, 2015 at 9:11 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
>> >> On Mon, Aug 31, 2015 at 10:58 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> >>> I cannot take this to meta-oe, because as soon as it's added there it
>> >>> will be used by all DISTROs even those who don't mind having GPLv3
>> >>> version.
>
>> >>> Everybody would need to define PREFERRED_VERSION, because
>> >>> DEFAULT_PREFERENCE is useless across different layers :/
>> >>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2964
>
>> >>> So this either has to be introduced in oe-core or in completely separate
>> >>> layer which would be included only by those who cannot use GPLv3.
>
> I think that the correct way to handle those recipes (that isn't core
> enough to be kept in oe-core) is to create a new layer, maybe meta-gplv2
> or meta-nongplv3; dependig on how explicit the naming should be. This
> layer could very well be put in meta-openembedded (the meta layer, not
> meta-oe).
>
>> >> Third option would be to reduce the priority of meta-oe to be lower
>> >> than oe-core.
>
>> >> That seems logical regardless of any GPLv3 discussion - since meta-oe
>> >> "fills in the gaps" in oe-core, if something _is_ present in oe-core
>> >> then it probably should be the default version.
>
>> > This scares me: to get a recipe in with old version not supporting
>> > modern file systems you want to change meta-oe's layer priority
>> > risiking unknown issues. I wonder how far the GPLv3 avoidance hype
>> > takes us...
>
>> No, if you read the various threads, my preference is to have the
>> GPLv2 parted recipe in oe-core. That option has been shot down though
>> and the general consensus seems to be that the older version of parted
>> is too buggy to be included anywhere in OE. That topic seems to be
>> closed.
>
>> Trying to understand why meta-oe needs a higher priority than oe-core
>> is a separate topic. If the priorities were changed it would allow
>> older (and newer) versions of oe-core recipes to safely live in
>> meta-oe. That would help non-GPLv3 versions of GPLv3 packages, but it
>> might be useful in other cases too.
>
> Well, changing the priority might have effects on peoples current
> builds; most likely effects that you don't anticipate during an upgrade.
>
> And at least periodically, meta-oe has modified how recipes from oe-core
> has been built. Thus, the need for a higher priority of meta-oe as
> compared to oe-core. (I know that I've had to undo such changes in my
> own layers in older releases).
Maybe just a personal preference, but I think completely replacing a
recipe is a hackish approach best reserved for private layers. Giving
meta-oe a higher priority wouldn't be needed if the oe-core recipes
were modified via a .bbappend or by getting the meta-oe tweaks merged
into oe-core. I don't know the history though. Maybe there are reasons
why this hasn't been possible.
According to bitbake-layers, the current list of oe-core recipes which
are over-ridden by meta-oe is quite short though:
iso-codes:
meta-oe 1.4
meta 3.58
libcap-ng:
meta-oe 0.7.7
meta 0.7.7
nativesdk-swig:
meta-oe 3.0.6
meta 3.0.6
xserver-nodm-init:
meta-oe 2.0
meta 1.0
The first 3 are transient (the oe-core versions were recently added
and the meta-oe versions can be removed). Having meta-oe over-ride
oe-core isn't necessary or helpful for these recipes.
I'm not sure what's going on with xserver-nodm-init. Both versions are
being updated independently but it looks like they could be unified
with minor changes.
> Cheers,
> Anders
>
> --
> Anders Darander
> ChargeStorm AB / eStorm AB
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-09-01 21:57 ` Andre McCurdy
@ 2015-09-01 22:07 ` Martin Jansa
2015-09-02 0:00 ` Khem Raj
2015-09-02 0:07 ` Andre McCurdy
0 siblings, 2 replies; 22+ messages in thread
From: Martin Jansa @ 2015-09-01 22:07 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4689 bytes --]
On Tue, Sep 01, 2015 at 02:57:29PM -0700, Andre McCurdy wrote:
> On Mon, Aug 31, 2015 at 11:36 PM, Anders Darander <anders@chargestorm.se> wrote:
> > * Andre McCurdy <armccurdy@gmail.com> [150831 22:03]:
> >
> >> On Mon, Aug 31, 2015 at 12:38 PM, Andreas Müller
> >> <schnitzeltony@googlemail.com> wrote:
> >> > On Mon, Aug 31, 2015 at 9:11 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> >> >> On Mon, Aug 31, 2015 at 10:58 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >> >>> I cannot take this to meta-oe, because as soon as it's added there it
> >> >>> will be used by all DISTROs even those who don't mind having GPLv3
> >> >>> version.
> >
> >> >>> Everybody would need to define PREFERRED_VERSION, because
> >> >>> DEFAULT_PREFERENCE is useless across different layers :/
> >> >>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2964
> >
> >> >>> So this either has to be introduced in oe-core or in completely separate
> >> >>> layer which would be included only by those who cannot use GPLv3.
> >
> > I think that the correct way to handle those recipes (that isn't core
> > enough to be kept in oe-core) is to create a new layer, maybe meta-gplv2
> > or meta-nongplv3; dependig on how explicit the naming should be. This
> > layer could very well be put in meta-openembedded (the meta layer, not
> > meta-oe).
> >
> >> >> Third option would be to reduce the priority of meta-oe to be lower
> >> >> than oe-core.
> >
> >> >> That seems logical regardless of any GPLv3 discussion - since meta-oe
> >> >> "fills in the gaps" in oe-core, if something _is_ present in oe-core
> >> >> then it probably should be the default version.
> >
> >> > This scares me: to get a recipe in with old version not supporting
> >> > modern file systems you want to change meta-oe's layer priority
> >> > risiking unknown issues. I wonder how far the GPLv3 avoidance hype
> >> > takes us...
> >
> >> No, if you read the various threads, my preference is to have the
> >> GPLv2 parted recipe in oe-core. That option has been shot down though
> >> and the general consensus seems to be that the older version of parted
> >> is too buggy to be included anywhere in OE. That topic seems to be
> >> closed.
> >
> >> Trying to understand why meta-oe needs a higher priority than oe-core
> >> is a separate topic. If the priorities were changed it would allow
> >> older (and newer) versions of oe-core recipes to safely live in
> >> meta-oe. That would help non-GPLv3 versions of GPLv3 packages, but it
> >> might be useful in other cases too.
> >
> > Well, changing the priority might have effects on peoples current
> > builds; most likely effects that you don't anticipate during an upgrade.
> >
> > And at least periodically, meta-oe has modified how recipes from oe-core
> > has been built. Thus, the need for a higher priority of meta-oe as
> > compared to oe-core. (I know that I've had to undo such changes in my
> > own layers in older releases).
>
> Maybe just a personal preference, but I think completely replacing a
> recipe is a hackish approach best reserved for private layers. Giving
> meta-oe a higher priority wouldn't be needed if the oe-core recipes
> were modified via a .bbappend or by getting the meta-oe tweaks merged
> into oe-core. I don't know the history though. Maybe there are reasons
> why this hasn't been possible.
>
> According to bitbake-layers, the current list of oe-core recipes which
> are over-ridden by meta-oe is quite short though:
>
> iso-codes:
> meta-oe 1.4
> meta 3.58
> libcap-ng:
> meta-oe 0.7.7
> meta 0.7.7
> nativesdk-swig:
> meta-oe 3.0.6
> meta 3.0.6
> xserver-nodm-init:
> meta-oe 2.0
> meta 1.0
>
> The first 3 are transient (the oe-core versions were recently added
> and the meta-oe versions can be removed). Having meta-oe over-ride
> oe-core isn't necessary or helpful for these recipes.
Yes, that's why I'm asking people migrating recipes to oe-core to send
removal patch to meta-oe (while verifying that what they migrated wasn't
modified in meta-oe after they created their copy) - some people do it
some don't.
> I'm not sure what's going on with xserver-nodm-init. Both versions are
> being updated independently but it looks like they could be unified
> with minor changes.
Not minor changes, there is long ticket in bugzilla mostly related to
x11-common xserver-common, which result in this xserver-nodm-init
difference.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-09-01 22:07 ` Martin Jansa
@ 2015-09-02 0:00 ` Khem Raj
2015-09-02 0:07 ` Andre McCurdy
1 sibling, 0 replies; 22+ messages in thread
From: Khem Raj @ 2015-09-02 0:00 UTC (permalink / raw)
To: OpenEmbedded Devel List
[-- Attachment #1: Type: text/plain, Size: 1728 bytes --]
> On Sep 1, 2015, at 3:07 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>>
>> According to bitbake-layers, the current list of oe-core recipes which
>> are over-ridden by meta-oe is quite short though:
>>
>> iso-codes:
>> meta-oe 1.4
>> meta 3.58
>> libcap-ng:
>> meta-oe 0.7.7
>> meta 0.7.7
>> nativesdk-swig:
>> meta-oe 3.0.6
>> meta 3.0.6
>> xserver-nodm-init:
>> meta-oe 2.0
>> meta 1.0
>>
>> The first 3 are transient (the oe-core versions were recently added
>> and the meta-oe versions can be removed). Having meta-oe over-ride
>> oe-core isn't necessary or helpful for these recipes.
>
> Yes, that's why I'm asking people migrating recipes to oe-core to send
> removal patch to meta-oe (while verifying that what they migrated wasn't
> modified in meta-oe after they created their copy) - some people do it
> some don’t.
I think such migration to other layer patches should be held from new target layer until the removal patches are
also available on the mailing list. So this activity can be done synchronously. Layer maintainers should take note
of such changes and advise the developers to do the needed. Please reply with comments to such patches on mailing lists
to raise the awareness.
>
>> I'm not sure what's going on with xserver-nodm-init. Both versions are
>> being updated independently but it looks like they could be unified
>> with minor changes.
>
> Not minor changes, there is long ticket in bugzilla mostly related to
> x11-common xserver-common, which result in this xserver-nodm-init
> difference.
>
> Regards,
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3
2015-09-01 22:07 ` Martin Jansa
2015-09-02 0:00 ` Khem Raj
@ 2015-09-02 0:07 ` Andre McCurdy
1 sibling, 0 replies; 22+ messages in thread
From: Andre McCurdy @ 2015-09-02 0:07 UTC (permalink / raw)
To: openembedded-devel
On Tue, Sep 1, 2015 at 3:07 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Tue, Sep 01, 2015 at 02:57:29PM -0700, Andre McCurdy wrote:
>> On Mon, Aug 31, 2015 at 11:36 PM, Anders Darander <anders@chargestorm.se> wrote:
>> > * Andre McCurdy <armccurdy@gmail.com> [150831 22:03]:
>> >
>> >> On Mon, Aug 31, 2015 at 12:38 PM, Andreas Müller
>> >> <schnitzeltony@googlemail.com> wrote:
>> >> > On Mon, Aug 31, 2015 at 9:11 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
>> >> >> On Mon, Aug 31, 2015 at 10:58 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> >> >>> I cannot take this to meta-oe, because as soon as it's added there it
>> >> >>> will be used by all DISTROs even those who don't mind having GPLv3
>> >> >>> version.
>> >
>> >> >>> Everybody would need to define PREFERRED_VERSION, because
>> >> >>> DEFAULT_PREFERENCE is useless across different layers :/
>> >> >>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2964
>> >
>> >> >>> So this either has to be introduced in oe-core or in completely separate
>> >> >>> layer which would be included only by those who cannot use GPLv3.
>> >
>> > I think that the correct way to handle those recipes (that isn't core
>> > enough to be kept in oe-core) is to create a new layer, maybe meta-gplv2
>> > or meta-nongplv3; dependig on how explicit the naming should be. This
>> > layer could very well be put in meta-openembedded (the meta layer, not
>> > meta-oe).
>> >
>> >> >> Third option would be to reduce the priority of meta-oe to be lower
>> >> >> than oe-core.
>> >
>> >> >> That seems logical regardless of any GPLv3 discussion - since meta-oe
>> >> >> "fills in the gaps" in oe-core, if something _is_ present in oe-core
>> >> >> then it probably should be the default version.
>> >
>> >> > This scares me: to get a recipe in with old version not supporting
>> >> > modern file systems you want to change meta-oe's layer priority
>> >> > risiking unknown issues. I wonder how far the GPLv3 avoidance hype
>> >> > takes us...
>> >
>> >> No, if you read the various threads, my preference is to have the
>> >> GPLv2 parted recipe in oe-core. That option has been shot down though
>> >> and the general consensus seems to be that the older version of parted
>> >> is too buggy to be included anywhere in OE. That topic seems to be
>> >> closed.
>> >
>> >> Trying to understand why meta-oe needs a higher priority than oe-core
>> >> is a separate topic. If the priorities were changed it would allow
>> >> older (and newer) versions of oe-core recipes to safely live in
>> >> meta-oe. That would help non-GPLv3 versions of GPLv3 packages, but it
>> >> might be useful in other cases too.
>> >
>> > Well, changing the priority might have effects on peoples current
>> > builds; most likely effects that you don't anticipate during an upgrade.
>> >
>> > And at least periodically, meta-oe has modified how recipes from oe-core
>> > has been built. Thus, the need for a higher priority of meta-oe as
>> > compared to oe-core. (I know that I've had to undo such changes in my
>> > own layers in older releases).
>>
>> Maybe just a personal preference, but I think completely replacing a
>> recipe is a hackish approach best reserved for private layers. Giving
>> meta-oe a higher priority wouldn't be needed if the oe-core recipes
>> were modified via a .bbappend or by getting the meta-oe tweaks merged
>> into oe-core. I don't know the history though. Maybe there are reasons
>> why this hasn't been possible.
>>
>> According to bitbake-layers, the current list of oe-core recipes which
>> are over-ridden by meta-oe is quite short though:
>>
>> iso-codes:
>> meta-oe 1.4
>> meta 3.58
>> libcap-ng:
>> meta-oe 0.7.7
>> meta 0.7.7
>> nativesdk-swig:
>> meta-oe 3.0.6
>> meta 3.0.6
>> xserver-nodm-init:
>> meta-oe 2.0
>> meta 1.0
>>
>> The first 3 are transient (the oe-core versions were recently added
>> and the meta-oe versions can be removed). Having meta-oe over-ride
>> oe-core isn't necessary or helpful for these recipes.
>
> Yes, that's why I'm asking people migrating recipes to oe-core to send
> removal patch to meta-oe (while verifying that what they migrated wasn't
> modified in meta-oe after they created their copy) - some people do it
> some don't.
Yes. If a recipe gets merged into oe-core and updated and the meta-oe
removal patch is slow to be sent out then, due to the layer priority,
it's the meta-oe users who suffer. That transition phase uncertainty
would go away if meta-oe were a lower priority than oe-core.
>> I'm not sure what's going on with xserver-nodm-init. Both versions are
>> being updated independently but it looks like they could be unified
>> with minor changes.
>
> Not minor changes, there is long ticket in bugzilla mostly related to
> x11-common xserver-common, which result in this xserver-nodm-init
> difference.
I found this. Is that the one you mean?
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5546
Anyway, I don't use X11 and I don't know the history here so I'm
probably over-simplifying. My comment was only based on the fact that
xserver-nodm-init is a ~70 line script and the x11-common -vs-
xserver-common differences could be handled via a conditional test in
the script. Not ideal but perhaps better than maintaining two
independent forks of xserver-nodm-init.
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2015-09-02 0:07 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-06 1:51 [meta-oe][PATCH] parted_1.8.6.bb: add parted that not GPLv3 Lei Maohui
2015-07-06 22:22 ` Andre McCurdy
2015-07-07 3:50 ` FW: [oe] " Lei, Maohui
2015-07-07 8:18 ` Burton, Ross
2015-07-07 13:30 ` Alexander Kanavin
2015-07-07 13:38 ` Burton, Ross
2015-07-07 13:55 ` Alexander Kanavin
2015-07-07 13:59 ` Otavio Salvador
2015-07-08 9:18 ` Lei, Maohui
2015-07-09 0:43 ` Lei, Maohui
2015-07-08 9:26 ` Lei, Maohui
2015-08-31 17:58 ` Martin Jansa
2015-08-31 19:11 ` Andre McCurdy
2015-08-31 19:35 ` Martin Jansa
2015-08-31 19:50 ` Andre McCurdy
2015-08-31 19:38 ` Andreas Müller
2015-08-31 20:02 ` Andre McCurdy
2015-09-01 6:36 ` Anders Darander
2015-09-01 21:57 ` Andre McCurdy
2015-09-01 22:07 ` Martin Jansa
2015-09-02 0:00 ` Khem Raj
2015-09-02 0:07 ` Andre McCurdy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.