[OE-core] [PATCH] meta/recipes-core/util-linux/util-linux-2.20.1: remove-lscpu.patch rewrote for util-linux 2.20.1
Saul Wold
sgw at linux.intel.com
Thu Jan 5 18:33:04 UTC 2012
On 01/05/2012 08:27 AM, Andrei Gherzan wrote:
> From: Andrei Gherzan<andrei.gherzan at windriver.com>
>
> The patch was modified in order to apply on 2.20.1 successfully.
>
> [YOCTO #1875]
>
I already had a patch for this out last night!
Actually, turns out to be simpler, since the Makefile.am should
correctly generate the Makefile.in there should be no need to patch
Makefile.in.
Sau!
> Signed-off-by: Andrei Gherzan<andrei at gherzan.ro>
> ---
> .../util-linux-2.20.1/remove-lscpu.patch | 92 +++++++++++---------
> 1 files changed, 49 insertions(+), 43 deletions(-)
>
> diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
> index afa50f4..830d016 100644
> --- a/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
> +++ b/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
> @@ -2,108 +2,114 @@ Upstream-Status: Inappropriate [distribution]
>
> Take out lscpu stuff from the code
>
> +2012/01/05
> +Andrei Gherzan<andrei at gherzan.ro>
> +
> 2011/03/17
> Saul Wold<saul.wold at intel.com>
> Nitin A Kamble<nitin.a.kamble at intel.com>
>
> -Index: util-linux-2.19.1/sys-utils/Makefile.am
> +Index: util-linux-2.20.1/sys-utils/Makefile.am
> ===================================================================
> ---- util-linux-2.19.1.orig/sys-utils/Makefile.am 2011-04-05 03:43:02.000000000 -0700
> -+++ util-linux-2.19.1/sys-utils/Makefile.am 2011-06-29 12:08:24.187440334 -0700
> +--- util-linux-2.20.1.orig/sys-utils/Makefile.am 2012-01-05 17:35:54.256629191 +0200
> ++++ util-linux-2.20.1/sys-utils/Makefile.am 2012-01-05 17:37:04.032628555 +0200
> @@ -17,12 +17,6 @@
> dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
> ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
>
> -if HAVE_CPU_SET_T
> -usrbin_exec_PROGRAMS += lscpu
> --lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
> +-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c $(top_srcdir)/lib/strutils.c
> -dist_man_MANS += lscpu.1
> -endif
> -
> endif
>
> cytune_SOURCES = cytune.c cyclades.h
> -Index: util-linux-2.19.1/sys-utils/Makefile.in
> +Index: util-linux-2.20.1/sys-utils/Makefile.in
> ===================================================================
> ---- util-linux-2.19.1.orig/sys-utils/Makefile.in 2011-05-02 02:49:19.000000000 -0700
> -+++ util-linux-2.19.1/sys-utils/Makefile.in 2011-06-29 12:10:47.647440371 -0700
> +--- util-linux-2.20.1.orig/sys-utils/Makefile.in 2012-01-05 16:54:49.692651653 +0200
> ++++ util-linux-2.20.1/sys-utils/Makefile.in 2012-01-05 17:01:12.868648159 +0200
> @@ -51,8 +51,6 @@
> @LINUX_TRUE at am__append_5 = dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
> @LINUX_TRUE@ ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
>
> - at HAVE_CPU_SET_T_TRUE@@LINUX_TRUE at am__append_6 = lscpu
> - at HAVE_CPU_SET_T_TRUE@@LINUX_TRUE at am__append_7 = lscpu.1
> - @BUILD_FALLOCATE_TRUE at am__append_8 = fallocate
> - @BUILD_FALLOCATE_TRUE at am__append_9 = fallocate.1
> - @BUILD_PIVOT_ROOT_TRUE at am__append_10 = pivot_root
> -@@ -98,7 +96,6 @@
> - @BUILD_PIVOT_ROOT_TRUE at am__EXEEXT_4 = pivot_root$(EXEEXT)
> - @BUILD_SWITCH_ROOT_TRUE at am__EXEEXT_5 = switch_root$(EXEEXT)
> - @LINUX_TRUE at am__EXEEXT_6 = cytune$(EXEEXT) setarch$(EXEEXT)
> -- at HAVE_CPU_SET_T_TRUE@@LINUX_TRUE at am__EXEEXT_7 = lscpu$(EXEEXT)
> - @BUILD_FALLOCATE_TRUE at am__EXEEXT_8 = fallocate$(EXEEXT)
> - @BUILD_UNSHARE_TRUE at am__EXEEXT_9 = unshare$(EXEEXT)
> - @LINUX_TRUE at am__EXEEXT_10 = ldattach$(EXEEXT) tunelp$(EXEEXT) \
> -@@ -146,11 +143,6 @@
> + @BUILD_MOUNTPOINT_TRUE at am__append_8 = mountpoint
> + @BUILD_MOUNTPOINT_TRUE at am__append_9 = mountpoint.1
> + @BUILD_FALLOCATE_TRUE at am__append_10 = fallocate
> +@@ -93,7 +91,6 @@
> + @BUILD_PIVOT_ROOT_TRUE at am__EXEEXT_5 = pivot_root$(EXEEXT)
> + @BUILD_SWITCH_ROOT_TRUE at am__EXEEXT_6 = switch_root$(EXEEXT)
> + @LINUX_TRUE at am__EXEEXT_7 = cytune$(EXEEXT) setarch$(EXEEXT)
> +- at HAVE_CPU_SET_T_TRUE@@LINUX_TRUE at am__EXEEXT_8 = lscpu$(EXEEXT)
> + @BUILD_FALLOCATE_TRUE at am__EXEEXT_9 = fallocate$(EXEEXT)
> + @BUILD_UNSHARE_TRUE at am__EXEEXT_10 = unshare$(EXEEXT)
> + @LINUX_TRUE at am__EXEEXT_11 = ldattach$(EXEEXT) tunelp$(EXEEXT) \
> +@@ -141,13 +138,6 @@
> ldattach_SOURCES = ldattach.c
> ldattach_OBJECTS = ldattach.$(OBJEXT)
> ldattach_LDADD = $(LDADD)
> --am__lscpu_SOURCES_DIST = lscpu.c $(top_srcdir)/lib/cpuset.c
> +-am__lscpu_SOURCES_DIST = lscpu.c $(top_srcdir)/lib/cpuset.c \
> +- $(top_srcdir)/lib/strutils.c
> - at HAVE_CPU_SET_T_TRUE@@LINUX_TRUE at am_lscpu_OBJECTS = lscpu.$(OBJEXT) \
> -- at HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@ cpuset.$(OBJEXT)
> +- at HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@ cpuset.$(OBJEXT) \
> +- at HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@ strutils.$(OBJEXT)
> -lscpu_OBJECTS = $(am_lscpu_OBJECTS)
> -lscpu_LDADD = $(LDADD)
> - pivot_root_SOURCES = pivot_root.c
> - pivot_root_OBJECTS = pivot_root.$(OBJEXT)
> - pivot_root_LDADD = $(LDADD)
> -@@ -206,13 +198,13 @@
> + mountpoint_SOURCES = mountpoint.c
> + mountpoint_OBJECTS = mountpoint-mountpoint.$(OBJEXT)
> + @BUILD_MOUNTPOINT_TRUE at mountpoint_DEPENDENCIES = $(ul_libmount_la)
> +@@ -209,14 +199,14 @@
> am__v_GEN_0 = @echo " GEN " $@;
> SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
> $(fallocate_SOURCES) flock.c fsfreeze.c $(fstrim_SOURCES) \
> - ipcmk.c ipcrm.c ipcs.c ldattach.c $(lscpu_SOURCES) \
> + ipcmk.c ipcrm.c ipcs.c ldattach.c \
> - pivot_root.c readprofile.c renice.c $(rtcwake_SOURCES) \
> - setarch.c setsid.c switch_root.c $(tunelp_SOURCES) unshare.c
> + mountpoint.c pivot_root.c readprofile.c renice.c \
> + $(rtcwake_SOURCES) setarch.c setsid.c switch_root.c \
> + $(tunelp_SOURCES) unshare.c
> DIST_SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
> $(am__fallocate_SOURCES_DIST) flock.c fsfreeze.c \
> $(fstrim_SOURCES) ipcmk.c ipcrm.c ipcs.c ldattach.c \
> -- $(am__lscpu_SOURCES_DIST) pivot_root.c readprofile.c renice.c \
> -+ pivot_root.c readprofile.c renice.c \
> - $(rtcwake_SOURCES) setarch.c setsid.c switch_root.c \
> - $(tunelp_SOURCES) unshare.c
> +- $(am__lscpu_SOURCES_DIST) mountpoint.c pivot_root.c \
> ++ mountpoint.c pivot_root.c \
> + readprofile.c renice.c $(rtcwake_SOURCES) setarch.c setsid.c \
> + switch_root.c $(tunelp_SOURCES) unshare.c
> am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
> -@@ -242,7 +234,7 @@
> +@@ -252,7 +242,7 @@
> MANS = $(dist_man_MANS) $(man_MANS)
> am__dist_noinst_DATA_DIST = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 \
> setsid.1 readprofile.1 dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
> - ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 lscpu.1 \
> + ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 \
> - fallocate.1 pivot_root.8 switch_root.8 unshare.1 arch.1
> + mountpoint.1 fallocate.1 pivot_root.8 switch_root.8 unshare.1 \
> + arch.1
> DATA = $(dist_noinst_DATA)
> - ETAGS = etags
> -@@ -438,7 +430,6 @@
> +@@ -447,7 +437,6 @@
> readprofile.1 $(am__append_5) $(am__append_7) $(am__append_9) \
> $(am__append_11) $(am__append_13) $(am__append_15) \
> - $(am__append_17)
> -- at HAVE_CPU_SET_T_TRUE@@LINUX_TRUE at lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
> + $(am__append_17) $(am__append_19)
> +- at HAVE_CPU_SET_T_TRUE@@LINUX_TRUE at lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c $(top_srcdir)/lib/strutils.c
> cytune_SOURCES = cytune.c cyclades.h
> tunelp_SOURCES = tunelp.c lp.h
> fstrim_SOURCES = fstrim.c $(top_srcdir)/lib/strutils.c
> -@@ -693,9 +684,6 @@
> +@@ -704,9 +693,6 @@
> ldattach$(EXEEXT): $(ldattach_OBJECTS) $(ldattach_DEPENDENCIES)
> @rm -f ldattach$(EXEEXT)
> $(AM_V_CCLD)$(LINK) $(ldattach_OBJECTS) $(ldattach_LDADD) $(LIBS)
> -lscpu$(EXEEXT): $(lscpu_OBJECTS) $(lscpu_DEPENDENCIES)
> - @rm -f lscpu$(EXEEXT)
> - $(AM_V_CCLD)$(LINK) $(lscpu_OBJECTS) $(lscpu_LDADD) $(LIBS)
> - pivot_root$(EXEEXT): $(pivot_root_OBJECTS) $(pivot_root_DEPENDENCIES)
> - @rm -f pivot_root$(EXEEXT)
> - $(AM_V_CCLD)$(LINK) $(pivot_root_OBJECTS) $(pivot_root_LDADD) $(LIBS)
> -@@ -743,7 +731,6 @@
> + mountpoint$(EXEEXT): $(mountpoint_OBJECTS) $(mountpoint_DEPENDENCIES)
> + @rm -f mountpoint$(EXEEXT)
> + $(AM_V_CCLD)$(mountpoint_LINK) $(mountpoint_OBJECTS) $(mountpoint_LDADD) $(LIBS)
> +@@ -757,7 +743,6 @@
> @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ipcrm.Po at am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ipcs.Po at am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ldattach.Po at am__quote@
> - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lscpu.Po at am__quote@
> + @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mountpoint-mountpoint.Po at am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pivot_root.Po at am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/readprofile.Po at am__quote@
> - @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/renice.Po at am__quote@
More information about the Openembedded-core
mailing list