From: Saul Wold <sgw@linux.intel.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Cc: Andrei Gherzan <andrei@gherzan.ro>,
Andrei Gherzan <andrei.gherzan@windriver.com>
Subject: Re: [PATCH] meta/recipes-core/util-linux/util-linux-2.20.1: remove-lscpu.patch rewrote for util-linux 2.20.1
Date: Thu, 05 Jan 2012 10:33:04 -0800 [thread overview]
Message-ID: <4F05ECE0.9010506@linux.intel.com> (raw)
In-Reply-To: <1325780866-18679-1-git-send-email-andrei@gherzan.ro>
On 01/05/2012 08:27 AM, Andrei Gherzan wrote:
> From: Andrei Gherzan<andrei.gherzan@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@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@gherzan.ro>
> +
> 2011/03/17
> Saul Wold<saul.wold@intel.com>
> Nitin A Kamble<nitin.a.kamble@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@am__append_5 = dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
> @LINUX_TRUE@ ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
>
> -@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_6 = lscpu
> -@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_7 = lscpu.1
> - @BUILD_FALLOCATE_TRUE@am__append_8 = fallocate
> - @BUILD_FALLOCATE_TRUE@am__append_9 = fallocate.1
> - @BUILD_PIVOT_ROOT_TRUE@am__append_10 = pivot_root
> -@@ -98,7 +96,6 @@
> - @BUILD_PIVOT_ROOT_TRUE@am__EXEEXT_4 = pivot_root$(EXEEXT)
> - @BUILD_SWITCH_ROOT_TRUE@am__EXEEXT_5 = switch_root$(EXEEXT)
> - @LINUX_TRUE@am__EXEEXT_6 = cytune$(EXEEXT) setarch$(EXEEXT)
> --@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__EXEEXT_7 = lscpu$(EXEEXT)
> - @BUILD_FALLOCATE_TRUE@am__EXEEXT_8 = fallocate$(EXEEXT)
> - @BUILD_UNSHARE_TRUE@am__EXEEXT_9 = unshare$(EXEEXT)
> - @LINUX_TRUE@am__EXEEXT_10 = ldattach$(EXEEXT) tunelp$(EXEEXT) \
> -@@ -146,11 +143,6 @@
> + @BUILD_MOUNTPOINT_TRUE@am__append_8 = mountpoint
> + @BUILD_MOUNTPOINT_TRUE@am__append_9 = mountpoint.1
> + @BUILD_FALLOCATE_TRUE@am__append_10 = fallocate
> +@@ -93,7 +91,6 @@
> + @BUILD_PIVOT_ROOT_TRUE@am__EXEEXT_5 = pivot_root$(EXEEXT)
> + @BUILD_SWITCH_ROOT_TRUE@am__EXEEXT_6 = switch_root$(EXEEXT)
> + @LINUX_TRUE@am__EXEEXT_7 = cytune$(EXEEXT) setarch$(EXEEXT)
> +-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__EXEEXT_8 = lscpu$(EXEEXT)
> + @BUILD_FALLOCATE_TRUE@am__EXEEXT_9 = fallocate$(EXEEXT)
> + @BUILD_UNSHARE_TRUE@am__EXEEXT_10 = unshare$(EXEEXT)
> + @LINUX_TRUE@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
> -@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am_lscpu_OBJECTS = lscpu.$(OBJEXT) \
> --@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@ cpuset.$(OBJEXT)
> +-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@ cpuset.$(OBJEXT) \
> +-@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@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)
> --@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
> + $(am__append_17) $(am__append_19)
> +-@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@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@./$(DEPDIR)/ipcrm.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcs.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldattach.Po@am__quote@
> -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lscpu.Po@am__quote@
> + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountpoint-mountpoint.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pivot_root.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readprofile.Po@am__quote@
> - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/renice.Po@am__quote@
prev parent reply other threads:[~2012-01-05 18:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-05 16:27 [PATCH] meta/recipes-core/util-linux/util-linux-2.20.1: remove-lscpu.patch rewrote for util-linux 2.20.1 Andrei Gherzan
2012-01-05 18:33 ` Saul Wold [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F05ECE0.9010506@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=andrei.gherzan@windriver.com \
--cc=andrei@gherzan.ro \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.