[PATCH][ZAB] debian package vars fixes

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

[PATCH][ZAB] debian package vars fixes

Kamal Mostafa-2
To support custom kernels derived from {Zesty, Artful, Bionic}:
  - bring forward the ship_extras_package feature from Xenial
  - stop forcing do_tools_common so that it can be disabled

These result in no changes to the master kernels, just allows derivs to
override standard behaviors.

 -Kamal

---

Kamal Mostafa (2):
  UBUNTU: [debian] support for ship_extras_package=false
  UBUNTU: [debian] do not force do_tools_common

 debian/rules                    |  2 +-
 debian/rules.d/2-binary-arch.mk | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

--
2.7.4


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

UBUNTU: [debian] support for ship_extras_package=false

Kamal Mostafa-2
If optional .mk variable 'ship_extras_package' is explicitly set to false,
then do not construct the linux-image-extra package; instead just log all
of the "extra" modules which were pointlessly built yet won't be shipped.
This feature may be useful for config debugging and for custom kernel
development.

Ignore: yes

Signed-off-by: Kamal Mostafa <[hidden email]>
Acked-by: Tim Gardner <[hidden email]>
Acked-by: Brad Figg <[hidden email]>
---
 debian/rules.d/2-binary-arch.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 0548a92..b0829c2 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -457,6 +457,7 @@ endif
 endif
 
 binary-%: pkgimg = $(bin_pkg_name)-$*
+binary-%: pkgdir_ex = $(CURDIR)/debian/$(extra_pkg_name)-$*
 binary-%: pkgimg_ex = $(extra_pkg_name)-$*
 binary-%: pkghdr = $(hdrs_pkg_name)-$*
 binary-%: dbgpkg = $(bin_pkg_name)-$*-dbgsym
@@ -481,6 +482,14 @@ binary-%: install-%
  dh_builddeb -p$(pkgimg)
 
 ifeq ($(do_extras_package),true)
+  ifeq ($(ship_extras_package),false)
+ # If $(ship_extras_package) is explicitly set to false, then do not
+ # construct the linux-image-extra package; instead just log all of the
+ # "extra" modules which were pointlessly built yet won't be shipped.
+ find $(pkgdir_ex) -name '*.ko' | sort \
+ | sed 's|^$(pkgdir_ex)/|NOT-SHIPPED |' \
+ | tee -a $(target_flavour).not-shipped.log;
+  else
  if [ -f $(DEBIAN)/control.d/$(target_flavour).inclusion-list ] ; then \
  dh_installchangelogs -p$(pkgimg_ex); \
  dh_installdocs -p$(pkgimg_ex); \
@@ -492,6 +501,7 @@ ifeq ($(do_extras_package),true)
  dh_md5sums -p$(pkgimg_ex); \
  dh_builddeb -p$(pkgimg_ex); \
  fi
+  endif
 endif
 
  dh_installchangelogs -p$(pkghdr)
--
2.7.4


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

UBUNTU: [debian] do not force do_tools_common

Kamal Mostafa-2
In reply to this post by Kamal Mostafa-2
Ignore: yes

Signed-off-by: Kamal Mostafa <[hidden email]>
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 2673f6f..8db64ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ 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
+do_tools_common?=true
 
 # Don't build tools or udebs in a cross compile environment.
 ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
--
2.7.4


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

ACK/APPLIED[B]: [PATCH][ZAB] debian package vars fixes

Seth Forshee
In reply to this post by Kamal Mostafa-2
On Wed, Dec 13, 2017 at 11:43:13AM -0800, Kamal Mostafa wrote:
> To support custom kernels derived from {Zesty, Artful, Bionic}:
>   - bring forward the ship_extras_package feature from Xenial
>   - stop forcing do_tools_common so that it can be disabled
>
> These result in no changes to the master kernels, just allows derivs to
> override standard behaviors.

Acked-by: Seth Forshee <[hidden email]>

Applied to bionic/master-next and unstable/master. Thanks!

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

ACK[Artful]: [PATCH][ZAB] debian package vars fixes

Stefan Bader-2
In reply to this post by Kamal Mostafa-2
On 13.12.2017 20:43, Kamal Mostafa wrote:

> To support custom kernels derived from {Zesty, Artful, Bionic}:
>   - bring forward the ship_extras_package feature from Xenial
>   - stop forcing do_tools_common so that it can be disabled
>
> These result in no changes to the master kernels, just allows derivs to
> override standard behaviors.
>
>  -Kamal
>
> ---
>
> Kamal Mostafa (2):
>   UBUNTU: [debian] support for ship_extras_package=false
>   UBUNTU: [debian] do not force do_tools_common
>
>  debian/rules                    |  2 +-
>  debian/rules.d/2-binary-arch.mk | 10 ++++++++++
>  2 files changed, 11 insertions(+), 1 deletion(-)
>
Acked-by: Stefan Bader <[hidden email]>



--
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[A]: [PATCH][ZAB] debian package vars fixes

Stefan Bader-2
In reply to this post by Kamal Mostafa-2
On 13.12.2017 20:43, Kamal Mostafa wrote:

> To support custom kernels derived from {Zesty, Artful, Bionic}:
>   - bring forward the ship_extras_package feature from Xenial
>   - stop forcing do_tools_common so that it can be disabled
>
> These result in no changes to the master kernels, just allows derivs to
> override standard behaviors.
>
>  -Kamal
>
> ---
>
> Kamal Mostafa (2):
>   UBUNTU: [debian] support for ship_extras_package=false
>   UBUNTU: [debian] do not force do_tools_common
>
>  debian/rules                    |  2 +-
>  debian/rules.d/2-binary-arch.mk | 10 ++++++++++
>  2 files changed, 11 insertions(+), 1 deletion(-)
>
Applied to artful/master-next-backlog


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

signature.asc (836 bytes) Download Attachment