From a7e567556f6a528f21dd06430ba437119a02dce7 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Mon, 18 Mar 2013 14:50:16 +1000 Subject: recipes: Updated recipes to match 'danny' versions Signed-off-by: Nathan Rossi --- recipes-core/glib-2.0/glib-2.0_2.30.3.bbappend | 23 ---------------------- recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend | 23 ++++++++++++++++++++++ .../sysvinit/sysvinit-inittab_2.88dsf.bbappend | 21 ++++++++++++++++++++ recipes-core/util-linux/util-linux_2.21.2.bbappend | 5 +++++ recipes-core/util-linux/util-linux_2.21.bbappend | 5 ----- 5 files changed, 49 insertions(+), 28 deletions(-) delete mode 100755 recipes-core/glib-2.0/glib-2.0_2.30.3.bbappend create mode 100644 recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend create mode 100644 recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend create mode 100644 recipes-core/util-linux/util-linux_2.21.2.bbappend delete mode 100644 recipes-core/util-linux/util-linux_2.21.bbappend (limited to 'recipes-core') diff --git a/recipes-core/glib-2.0/glib-2.0_2.30.3.bbappend b/recipes-core/glib-2.0/glib-2.0_2.30.3.bbappend deleted file mode 100755 index 598b1471..00000000 --- a/recipes-core/glib-2.0/glib-2.0_2.30.3.bbappend +++ /dev/null @@ -1,23 +0,0 @@ -# enforce the following configure setting, glib cannot resolve them for a cross -# target like microblaze/microblazeel. -# -# glib_cv_have_qsort_r=no -# glib_cv_long_long_format=I64 -# glib_cv_stack_grows=no -# glib_cv_uscore=yes -# ac_cv_func_posix_getpwuid_r=yes -# ac_cv_func_posix_getgrgid_r=yes - -EXTRA_OECONF_append_microblaze = " glib_cv_have_qsort_r=no" -EXTRA_OECONF_append_microblaze = " glib_cv_long_long_format=I64" -EXTRA_OECONF_append_microblaze = " glib_cv_stack_grows=no" -EXTRA_OECONF_append_microblaze = " glib_cv_uscore=yes" -EXTRA_OECONF_append_microblaze = " ac_cv_func_posix_getpwuid_r=yes" -EXTRA_OECONF_append_microblaze = " ac_cv_func_posix_getgrgid_r=yes" - -EXTRA_OECONF_append_microblazeel = " glib_cv_have_qsort_r=no" -EXTRA_OECONF_append_microblazeel = " glib_cv_long_long_format=I64" -EXTRA_OECONF_append_microblazeel = " glib_cv_stack_grows=no" -EXTRA_OECONF_append_microblazeel = " glib_cv_uscore=yes" -EXTRA_OECONF_append_microblazeel = " ac_cv_func_posix_getpwuid_r=yes" -EXTRA_OECONF_append_microblazeel = " ac_cv_func_posix_getgrgid_r=yes" \ No newline at end of file diff --git a/recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend b/recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend new file mode 100644 index 00000000..598b1471 --- /dev/null +++ b/recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend @@ -0,0 +1,23 @@ +# enforce the following configure setting, glib cannot resolve them for a cross +# target like microblaze/microblazeel. +# +# glib_cv_have_qsort_r=no +# glib_cv_long_long_format=I64 +# glib_cv_stack_grows=no +# glib_cv_uscore=yes +# ac_cv_func_posix_getpwuid_r=yes +# ac_cv_func_posix_getgrgid_r=yes + +EXTRA_OECONF_append_microblaze = " glib_cv_have_qsort_r=no" +EXTRA_OECONF_append_microblaze = " glib_cv_long_long_format=I64" +EXTRA_OECONF_append_microblaze = " glib_cv_stack_grows=no" +EXTRA_OECONF_append_microblaze = " glib_cv_uscore=yes" +EXTRA_OECONF_append_microblaze = " ac_cv_func_posix_getpwuid_r=yes" +EXTRA_OECONF_append_microblaze = " ac_cv_func_posix_getgrgid_r=yes" + +EXTRA_OECONF_append_microblazeel = " glib_cv_have_qsort_r=no" +EXTRA_OECONF_append_microblazeel = " glib_cv_long_long_format=I64" +EXTRA_OECONF_append_microblazeel = " glib_cv_stack_grows=no" +EXTRA_OECONF_append_microblazeel = " glib_cv_uscore=yes" +EXTRA_OECONF_append_microblazeel = " ac_cv_func_posix_getpwuid_r=yes" +EXTRA_OECONF_append_microblazeel = " ac_cv_func_posix_getgrgid_r=yes" \ No newline at end of file diff --git a/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend new file mode 100644 index 00000000..a14f28b4 --- /dev/null +++ b/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bbappend @@ -0,0 +1,21 @@ + +pkg_postinst_${PN} () { +#!/bin/sh +# run this on the target +if [ "x$D" == "x" ]; then + tmp="${SERIAL_CONSOLES_CHECK}" + for i in $tmp + do + j=`echo ${i} | sed s/^.*\;//g` + if [ -z "`cat /proc/consoles | grep ${j}`" ]; then + sed -i /^.*${j}$/d /etc/inittab + fi + done + kill -HUP 1 +elif [ -d "$D" ]; then + exit 0 +else + exit 1 +fi +} + diff --git a/recipes-core/util-linux/util-linux_2.21.2.bbappend b/recipes-core/util-linux/util-linux_2.21.2.bbappend new file mode 100644 index 00000000..057e880c --- /dev/null +++ b/recipes-core/util-linux/util-linux_2.21.2.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS := "${THISDIR}/files" + +# Apply patch to add "microblaze" support to util-linux +SRC_URI += "file://microblaze-fixes.patch" + diff --git a/recipes-core/util-linux/util-linux_2.21.bbappend b/recipes-core/util-linux/util-linux_2.21.bbappend deleted file mode 100644 index 057e880c..00000000 --- a/recipes-core/util-linux/util-linux_2.21.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS := "${THISDIR}/files" - -# Apply patch to add "microblaze" support to util-linux -SRC_URI += "file://microblaze-fixes.patch" - -- cgit v1.2.3-54-g00ecf