All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Pedersen <thomas@adapt-ip.com>
To: backports <backports@vger.kernel.org>
Cc: Hauke Mehrtens <hauke@hauke-m.de>,
	Luis Chamberlain <mcgrof@kernel.org>,
	Thomas Pedersen <thomas@ibsgaard.io>,
	Thomas Pedersen <thomas@adapt-ip.com>
Subject: [PATCH v2 12/15] integration-patches: refresh integration patch
Date: Fri, 13 May 2022 09:05:20 -0700	[thread overview]
Message-ID: <20220513160523.2944694-13-thomas@adapt-ip.com> (raw)
In-Reply-To: <20220513160523.2944694-1-thomas@adapt-ip.com>

From: Thomas Pedersen <thomas@ibsgaard.io>

This was refreshed on Linux v4.19

Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
---
 .../0001-enable-backports-built-in.patch      | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch b/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch
index d66b203d0d07..35765ed113eb 100644
--- a/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch
+++ b/integration-patches/0001-enable-backports/0001-enable-backports-built-in.patch
@@ -1,40 +1,36 @@
-Allow backports to be integrated into vmlinux.
-
 diff --git a/Makefile b/Makefile
-index 6d1e304..de26b18 100644
+index e5d41b6792d7..cdd600bda9d1 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -542,6 +542,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
- 	$(Q)$(MAKE) $(build)=$(@)
+@@ -594,6 +594,7 @@ export KBUILD_MODULES KBUILD_BUILTIN
  
+ ifeq ($(KBUILD_EXTMOD),)
  # Objects we will link into vmlinux / subdirs we need to visit
 +backports-y 	:= backports/
  init-y		:= init/
  drivers-y	:= drivers/ sound/ firmware/
  net-y		:= net/
-@@ -820,13 +821,16 @@ core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
+@@ -989,11 +990,13 @@ core-y		+= kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
  
  vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
  		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
 +		     $(backports-y) $(backports-m) \
- 		     $(net-y) $(net-m) $(libs-y) $(libs-m)))
+ 		     $(net-y) $(net-m) $(libs-y) $(libs-m) $(virt-y)))
  
  vmlinux-alldirs	:= $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \
- 		     $(init-n) $(init-) \
- 		     $(core-n) $(core-) $(drivers-n) $(drivers-) \
-+		     $(backports-n) $(backports-) \
- 		     $(net-n)  $(net-)  $(libs-n)    $(libs-))))
+-		     $(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-))))
++		     $(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-) $(backports))))
  
-+backports-y	:= $(patsubst %/, %/built-in.o, $(backports-y))
- init-y		:= $(patsubst %/, %/built-in.o, $(init-y))
- core-y		:= $(patsubst %/, %/built-in.o, $(core-y))
- drivers-y	:= $(patsubst %/, %/built-in.o, $(drivers-y))
-@@ -837,7 +841,7 @@ libs-y		:= $(libs-y1) $(libs-y2)
++backports-y	:= $(patsubst %/, %/built-in.a, $(backports-y))
+ init-y		:= $(patsubst %/, %/built-in.a, $(init-y))
+ core-y		:= $(patsubst %/, %/built-in.a, $(core-y))
+ drivers-y	:= $(patsubst %/, %/built-in.a, $(drivers-y))
+@@ -1004,7 +1007,7 @@ virt-y		:= $(patsubst %/, %/built-in.a, $(virt-y))
  
  # Externally visible symbols (used by link-vmlinux.sh)
  export KBUILD_VMLINUX_INIT := $(head-y) $(init-y)
--export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y)
-+export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(backports-y)
+-export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-y)
++export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-y) $(backports-y)
+ export KBUILD_VMLINUX_LIBS := $(libs-y1)
  export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds
  export LDFLAGS_vmlinux
- # used by scripts/pacmage/Makefile
-- 
2.30.2

--
To unsubscribe from this list: send the line "unsubscribe backports" in

  parent reply	other threads:[~2022-05-13 16:06 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-13 16:05 [PATCH v2 00/15] Resurrect Integration Mode v2 Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 01/15] backport/kconf: remove our version of kconfig Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 02/15] Squashed 'backport/kconf/' content from commit 98bda615 Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 03/15] kconfig: fix backport syntax to work with linux-next next-20220204 Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 04/15] Makefile.subtrees: document how to update kconfig Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 05/15] backport: define BACKPORT_DIR for Kconfig.integrate Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 06/15] gentree: update kconfig source var to new kconfig format Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 07/15] gentree: try to make patch operation idempotent in case of --clean Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 08/15] gentree: do not prefix Kernel.local symbols Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 09/15] lib/bpversion: calculate Kconfig.versions for next major version Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 10/15] backport: expose BP_MODULES in package mode only Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 11/15] kconfig: fix select conversion for BPAUTO_ symbols in integration mode Thomas Pedersen
2022-05-13 16:05 ` Thomas Pedersen [this message]
2022-05-13 16:05 ` [PATCH v2 13/15] integration-patches: make patches per target kernel version Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 14/15] integration-patches: support 5.4 target kernel Thomas Pedersen
2022-05-13 16:05 ` [PATCH v2 15/15] patches: fixup skb list patch Thomas Pedersen
2022-05-13 16:37 ` [PATCH v2 00/15] Resurrect Integration Mode v2 Luis Chamberlain

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=20220513160523.2944694-13-thomas@adapt-ip.com \
    --to=thomas@adapt-ip.com \
    --cc=backports@vger.kernel.org \
    --cc=hauke@hauke-m.de \
    --cc=mcgrof@kernel.org \
    --cc=thomas@ibsgaard.io \
    /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.