[PATCH 0/6 Xenial SRU] Fix derivatives build after tools-common removal

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
10 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 0/6 Xenial SRU] Fix derivatives build after tools-common removal

Thadeu Lima de Souza Cascardo-3
BugLink: https://bugs.launchpad.net/bugs/1691814

After the introduction of "UBUNTU: [Packaging] prevent linux-*-tools-common
from being produced from non linux packages", derivatives started failing to build.

The following patchset fixes that.

I plan to apply the first patch to master-next and, temporarily to all
derivatives. The other patches apply to their respective branches.

Regards.
Cascardo.

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH] UBUNTU: [Packaging] Set do_tools_common in common vars

Thadeu Lima de Souza Cascardo-3
BugLink: https://bugs.launchpad.net/bugs/1691814

In order to allow derivatives to really override do_tools_common inside
hooks.mk, it needs to be unconditionally set to true in
0-common-vars.mk, which is included before hooks.mk. Otherwise, hooks.mk
won't be able to override it, and it will be true unless other
conditions apply.

This has caused derivatives to fail to build after commit
13d6fbbef038fdaee35200496131e6c6c77eb4b4 ("UBUNTU: [Packaging] prevent
linux-*-tools-common from being produced from non linux packages").

Fixes: 13d6fbbef038fdaee35200496131e6c6c77eb4b4
Signed-off-by: Thadeu Lima de Souza Cascardo <[hidden email]>
---
 debian/rules                    | 1 -
 debian/rules.d/0-common-vars.mk | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index f2e801c62c82..8b18711125fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,6 @@ include $(DROOT)/rules.d/1-maintainer.mk
 
 do_linux_tools=$(sort $(filter-out false,$(do_tools_usbip) $(do_tools_cpupower) $(do_tools_perf) $(do_tools_x86)))
 do_cloud_tools=$(sort $(filter-out false,$(do_tools_hyperv)))
-do_tools_common=true
 
 # Don't build tools or udebs in a cross compile environment.
 ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index ccc65dc03358..0628e552183c 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -160,6 +160,9 @@ do_common_headers_indep=true
 # add a 'full source' mode
 do_full_source=false
 
+# build common tools
+do_tools_common=true
+
 # build tools
 ifneq ($(wildcard $(CURDIR)/tools),)
  ifeq ($(do_tools),)
--
2.11.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH] UBUNTU: [Packaging] Put hooks.mk file in the right place

Thadeu Lima de Souza Cascardo-3
In reply to this post by Thadeu Lima de Souza Cascardo-3
BugLink: https://bugs.launchpad.net/bugs/1691814

After the removal of *-tools-common packages, build started failing
because master added a rule to stop building if the non-master branch
tried to build *-tools-common packages.

hooks.mk should be in debian.gke/rules.d/, not debian.gke/.

Signed-off-by: Thadeu Lima de Souza Cascardo <[hidden email]>
---
 debian.gke/{ => rules.d}/hooks.mk | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename debian.gke/{ => rules.d}/hooks.mk (100%)

diff --git a/debian.gke/hooks.mk b/debian.gke/rules.d/hooks.mk
similarity index 100%
rename from debian.gke/hooks.mk
rename to debian.gke/rules.d/hooks.mk
--
2.11.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH] UBUNTU: [Packaging] Do not build tools-common

Thadeu Lima de Souza Cascardo-3
In reply to this post by Thadeu Lima de Souza Cascardo-3
BugLink: https://bugs.launchpad.net/bugs/1691814

After the removal of *-tools-common packages, build started failing
because master added a rule to stop building if the non-master branch
tried to build *-tools-common packages.

Set do_tools_common in derivative's hooks.mk.

Signed-off-by: Thadeu Lima de Souza Cascardo <[hidden email]>
---
 debian.aws/rules.d/hooks.mk | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 debian.aws/rules.d/hooks.mk

diff --git a/debian.aws/rules.d/hooks.mk b/debian.aws/rules.d/hooks.mk
new file mode 100644
index 000000000000..e0c4f46609e8
--- /dev/null
+++ b/debian.aws/rules.d/hooks.mk
@@ -0,0 +1 @@
+do_tools_common=false
--
2.11.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH] UBUNTU: [Packaging] Do not build tools-common

Thadeu Lima de Souza Cascardo-3
In reply to this post by Thadeu Lima de Souza Cascardo-3
BugLink: https://bugs.launchpad.net/bugs/1691814

After the removal of *-tools-common packages, build started failing
because master added a rule to stop building if the non-master branch
tried to build *-tools-common packages.

Set do_tools_common in derivative's hooks.mk.

Signed-off-by: Thadeu Lima de Souza Cascardo <[hidden email]>
---
 debian.snapdragon/rules.d/hooks.mk | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 debian.snapdragon/rules.d/hooks.mk

diff --git a/debian.snapdragon/rules.d/hooks.mk b/debian.snapdragon/rules.d/hooks.mk
new file mode 100644
index 000000000000..e0c4f46609e8
--- /dev/null
+++ b/debian.snapdragon/rules.d/hooks.mk
@@ -0,0 +1 @@
+do_tools_common=false
--
2.11.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH] UBUNTU: [Packaging] Do not build tools-common

Thadeu Lima de Souza Cascardo-3
In reply to this post by Thadeu Lima de Souza Cascardo-3
BugLink: https://bugs.launchpad.net/bugs/1691814

After the removal of *-tools-common packages, build started failing
because master added a rule to stop building if the non-master branch
tried to build *-tools-common packages.

Set do_tools_common in derivative's hooks.mk.

Signed-off-by: Thadeu Lima de Souza Cascardo <[hidden email]>
---
 debian.raspi2/rules.d/hooks.mk | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 debian.raspi2/rules.d/hooks.mk

diff --git a/debian.raspi2/rules.d/hooks.mk b/debian.raspi2/rules.d/hooks.mk
new file mode 100644
index 000000000000..e0c4f46609e8
--- /dev/null
+++ b/debian.raspi2/rules.d/hooks.mk
@@ -0,0 +1 @@
+do_tools_common=false
--
2.11.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH] UBUNTU: [Packaging] Do not build tools-common

Thadeu Lima de Souza Cascardo-3
In reply to this post by Thadeu Lima de Souza Cascardo-3
BugLink: https://bugs.launchpad.net/bugs/1691814

After the removal of *-tools-common packages, build started failing
because master added a rule to stop building if the non-master branch
tried to build *-tools-common packages.

Set do_tools_common in derivative's hooks.mk.

Signed-off-by: Thadeu Lima de Souza Cascardo <[hidden email]>
---
 debian.snapdragon/rules.d/hooks.mk | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 debian.snapdragon/rules.d/hooks.mk

diff --git a/debian.snapdragon/rules.d/hooks.mk b/debian.snapdragon/rules.d/hooks.mk
new file mode 100644
index 000000000000..e0c4f46609e8
--- /dev/null
+++ b/debian.snapdragon/rules.d/hooks.mk
@@ -0,0 +1 @@
+do_tools_common=false
--
2.11.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK/cmnt: [PATCH 0/6 Xenial SRU] Fix derivatives build after tools-common removal

Kleber Souza
In reply to this post by Thadeu Lima de Souza Cascardo-3
Changes look good.

Just a minor comment: some patches are missing the target branch on the
subject to help identify where to apply them. But since you will
probably be the one applying them, that doesn't matter much :-).

For all 6 patches:

Acked-by: Kleber Sacilotto de Souza <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH 0/6 Xenial SRU] Fix derivatives build after tools-common removal

Stefan Bader-2
In reply to this post by Thadeu Lima de Souza Cascardo-3



--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

APPLIED: [PATCH 0/6 Xenial SRU] Fix derivatives build after tools-common removal

Thadeu Lima de Souza Cascardo-3
In reply to this post by Thadeu Lima de Souza Cascardo-3
Applied first patch to aws, gke, raspi2, snapdragon and lts-xenial
branches. Also applied to xenial master-next branch. Other patches to
their respective branches: aws, gke, raspi2 and snapdragon. lts-xenial
already had do_tools_common=false in its hooks.mk.

Thanks.
Cascardo.

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team