Skip to contentSkip to conversation

meta-darwin on dylan branch

PATCH In review Woodyatt, James 1 participant 2 messages May 1, 2014 – May 6, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 meta-darwin on dylan branch

commit 980fb673e887f321d6b417b3aecbb380fa2561d3

Author: james woodyatt <[email protected]>
Date:   Thu May 1 11:57:05 2014 -0700

Properly configure util-linux when ncurses is configured —with-libterm=tinfo.

Amend oecore.patch to modify the util-linux recipe so that it applies a patch to the fdisk/Makemodule.am file to add -ltinfo to the linker command line when HAVE_TINFO and HAVE_NCURSES are both defined.

oecore.patch +30 -0
index 333b715..7371244 100644
@@ -3242,3 +3242,33 @@ index b1d2612..1ba0d12 100644
 +
 +BBCLASSEXTEND = "nativesdk"
 \ No newline at end of file
+diff --git a/meta/recipes-core/util-linux/util-linux/cfdisk-makemodule.patch b/meta/recipes-core/util-linux/util-linux/cfdisk-makemodule.patch
+new file mode 100644
+index 0000000..df196b5
+--- /dev/null
++++ b/meta/recipes-core/util-linux/util-linux/cfdisk-makemodule.patch
+@@ -0,0 +1,12 @@
++--- util-linux-2.22.2.orig/fdisks/Makemodule.am	2014-04-30 17:02:21.469000162 -0700
+++++ util-linux-2.22.2/fdisks/Makemodule.am	2014-04-30 17:02:55.390999973 -0700
++@@ -78,6 +78,9 @@
++ cfdisk_LDADD += -lslang
++ else
++ if HAVE_NCURSES
+++if HAVE_TINFO
+++cfdisk_LDADD += -ltinfo
+++endif
++ cfdisk_LDADD += @NCURSES_LIBS@
++ endif
++ endif
+diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
+index 43a55a6..5553411 100644
+--- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb
++++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
+@@ -8,6 +8,7 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
+             file://configure-sbindir.patch \
+             file://fix-configure.patch \
+             file://mbsalign-license.patch \
++            file://cfdisk-makemodule.patch \
+ "
+ 
+ SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e"

—
james woodyatt <[email protected]>
Software Architect, New Devices Group

#1 lore raw

Everyone—

It looks like this one needs to be applied to the OpenEmbedded core on the ‘dylan’ branch to make the Linux meta-toolchain build work.

—
james woodyatt <[email protected]>
Software Architect, New Devices Group

Quoted 58 lines · James

commit 980fb673e887f321d6b417b3aecbb380fa2561d3

Author: james woodyatt <[email protected]>
Date:   Thu May 1 11:57:05 2014 -0700

Properly configure util-linux when ncurses is configured —with-libterm=tinfo.

Amend oecore.patch to modify the util-linux recipe so that it applies a patch to the fdisk/Makemodule.am file to add -ltinfo to the linker command line when HAVE_TINFO and HAVE_NCURSES are both defined.

oecore.patch +32 -0
index 333b715..7371244 100644
@@ -3242,3 +3242,33 @@ index b1d2612..1ba0d12 100644
+
+BBCLASSEXTEND = "nativesdk"
\ No newline at end of file
+diff --git a/meta/recipes-core/util-linux/util-linux/cfdisk-makemodule.patch b/meta/recipes-core/util-linux/util-linux/cfdisk-makemodule.patch
+new file mode 100644
+index 0000000..df196b5
+--- /dev/null
++++ b/meta/recipes-core/util-linux/util-linux/cfdisk-makemodule.patch
+@@ -0,0 +1,12 @@
++--- util-linux-2.22.2.orig/fdisks/Makemodule.am	2014-04-30 17:02:21.469000162 -0700
+++++ util-linux-2.22.2/fdisks/Makemodule.am	2014-04-30 17:02:55.390999973 -0700
++@@ -78,6 +78,9 @@
++ cfdisk_LDADD += -lslang
++ else
++ if HAVE_NCURSES
+++if HAVE_TINFO
+++cfdisk_LDADD += -ltinfo
+++endif
++ cfdisk_LDADD += @NCURSES_LIBS@
++ endif
++ endif
+diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
+index 43a55a6..5553411 100644
+--- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb
++++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb
+@@ -8,6 +8,7 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
+             file://configure-sbindir.patch \
+             file://fix-configure.patch \
+             file://mbsalign-license.patch \
++            file://cfdisk-makemodule.patch \
+ "
+ 
+ SRC_URI[md5sum] = "3e379b4d8b9693948d751c154614c73e"
 

—
james woodyatt <[email protected]>
Software Architect, New Devices Group

Signature · 4 lines
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto