Merge ~vicamo/ubuntu/+source/v4l2loopback/+git/v4l2loopback:bug-2007333/skip-passing-CC-when-empty/lunar into ubuntu/+source/v4l2loopback:ubuntu/devel

Proposed by You-Sheng Yang
Status: Needs review
Proposed branch: ~vicamo/ubuntu/+source/v4l2loopback/+git/v4l2loopback:bug-2007333/skip-passing-CC-when-empty/lunar
Merge into: ubuntu/+source/v4l2loopback:ubuntu/devel
Diff against target: 33 lines (+8/-2)
2 files modified
debian/changelog (+6/-0)
debian/patches/exact-cc.patch (+2/-2)
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Pending
Review via email: mp+437332@code.launchpad.net

Commit message

* Skip passing CC when empty (LP: #2007333)

Description of the change

inline dkms build inside the linux/lunar kernel package is invoked with an empty CC.

To post a comment you must log in.

Unmerged commits

1e3e189... by You-Sheng Yang

Bug 2007333: skip passing CC when empty

BugLink: https://bugs.launchpad.net/bugs/2007333
Signed-off-by: You-Sheng Yang (vicamo) <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 61bd4df..bb0e5c7 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+v4l2loopback (0.12.7-2ubuntu3) lunar; urgency=medium
7+
8+ * Skip passing CC when empty (LP: #2007333)
9+
10+ -- You-Sheng Yang <vicamo.yano@canonical.com> Wed, 15 Feb 2023 12:16:13 +0800
11+
12 v4l2loopback (0.12.7-2ubuntu2) kinetic; urgency=medium
13
14 * Preserve CC setting when invoking sub-make, to ensure module can be
15diff --git a/debian/patches/exact-cc.patch b/debian/patches/exact-cc.patch
16index e272f8d..0333f74 100644
17--- a/debian/patches/exact-cc.patch
18+++ b/debian/patches/exact-cc.patch
19@@ -13,12 +13,12 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/1991664
20 v4l2loopback.ko:
21 @echo "Building v4l2-loopback driver..."
22 - $(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules
23-+ $(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules CC=$(CC)
24++ $(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules $(if $(CC),CC=$(CC))
25
26 install-all: install install-utils install-man
27 install:
28 - $(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules_install
29-+ $(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules_install CC=$(CC)
30++ $(MAKE) -C $(KERNEL_DIR) M=$(PWD) modules_install $(if $(CC),CC=$(CC))
31 @echo ""
32 @echo "SUCCESS (if you got 'SSL errors' above, you can safely ignore them)"
33 @echo ""

Subscribers

People subscribed via source and target branches