Skip to content

Commit 3515c88

Browse files
AttilaFueloeptonyhutter
authored andcommitted
objtool-wrapper: Update Debian packaging
6cf17f6 (#17456) introduced a change to `configure.ac` which breaks the patching done in the Debian packages DKMS source installation phase. This results in a failed module build. Adapt the awk script doing the patching to handle the added `AC_CONFIG_FILE` entry. Reviewed-by: Brian Behlendorf <[email protected]> Tested-by: Shengqi Chen <[email protected]> Signed-off-by: Attila Fülöp <[email protected]> Closes #17633 Closes #17646
1 parent 0d6a0e5 commit 3515c88

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

contrib/debian/rules.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ override_dh_auto_install:
108108
@# - zfs.release$
109109
@# * Takes care of spaces and tabs
110110
@# * Remove reference to ZFS_AC_PACKAGE
111-
awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ {\
112-
if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/(Makefile|sys|os\/(Makefile|linux))|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/) \
111+
awk '/^AC_CONFIG_FILES\(\[/,/\]\)/ {\
112+
if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/(Makefile|sys|os\/(Makefile|linux))|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))|scripts\/objtool-wrapper.*\]\)$$/) \
113113
{next} } {print}' \
114114
'$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' | sed '/ZFS_AC_PACKAGE/d' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac'
115115
@# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs.

0 commit comments

Comments
 (0)