| Message ID | 20220914135455.2685644-5-apw@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/9] UBUNTU: [Packaging] fix our dh_clean override | expand |
On 14.09.22 15:54, Andy Whitcroft wrote: > In places we use line continuation within a shell here document. These > need to use double backslash in order to maintain the continuation in > debian/rules.gen. > > Signed-off-by: Andy Whitcroft <apw@canonical.com> > --- This also abandons having continuation aligned except for very long lines. Personally I find that easier to read. Any reason for doing so? -Stefan > debian/scripts/gen-rules.lrg | 8 ++++---- > debian/scripts/gen-rules.lrs | 8 ++++---- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/debian/scripts/gen-rules.lrg b/debian/scripts/gen-rules.lrg > index db61327..d1e528a 100755 > --- a/debian/scripts/gen-rules.lrg > +++ b/debian/scripts/gen-rules.lrg > @@ -140,10 +140,10 @@ EOL > $targets:: > install -d \$(custom_dir)/${src_abi}-${flavour}/signatures/nvidia-${suffix_short} > cp -rp /lib/modules/${src_abi}-${flavour}/kernel/nvidia-${suffix_short}/bits \$(custom_dir)/${src_abi}-${flavour}/signatures/nvidia-${suffix_short} > - ( \ > - cd \$(custom_dir)/${src_abi}-${flavour}/signatures/nvidia-${suffix_short}/bits || exit 1; \ > - sh BUILD unsigned || exit 1; \ > - mv *.ko ..; \ > + ( \\ > + cd \$(custom_dir)/${src_abi}-${flavour}/signatures/nvidia-${suffix_short}/bits || exit 1; \\ > + sh BUILD unsigned || exit 1; \\ > + mv *.ko ..; \\ > ) > rm -rf \$(custom_dir)/${src_abi}-${flavour}/signatures/nvidia-${suffix_short}/bits > EOL > diff --git a/debian/scripts/gen-rules.lrs b/debian/scripts/gen-rules.lrs > index e2ab3a1..f7f7648 100755 > --- a/debian/scripts/gen-rules.lrs > +++ b/debian/scripts/gen-rules.lrs > @@ -76,10 +76,10 @@ do > cat - >>"debian/rules.gen" <<EOL > > $targets:: > - for stream in "${src_genr_version}/${src_abi}-${flavour}/signatures"/*; \ > - do \ > - nvidia=\$\$(basename "\$\$stream"); \ > - echo "\$\$stream/* /lib/modules/${src_abi}-${flavour}/kernel/\$\$nvidia/bits" >>debian/linux-signatures-nvidia-${src_abi}-${flavour}.install; \ > + for stream in "${src_genr_version}/${src_abi}-${flavour}/signatures"/*; \\ > + do \\ > + nvidia=\$\$(basename "\$\$stream"); \\ > + echo "\$\$stream/* /lib/modules/${src_abi}-${flavour}/kernel/\$\$nvidia/bits" >>debian/linux-signatures-nvidia-${src_abi}-${flavour}.install; \\ > done > EOL >
diff --git a/debian/scripts/gen-rules.lrg b/debian/scripts/gen-rules.lrg index db61327..d1e528a 100755 --- a/debian/scripts/gen-rules.lrg +++ b/debian/scripts/gen-rules.lrg @@ -140,10 +140,10 @@ EOL $targets:: install -d \$(custom_dir)/${src_abi}-${flavour}/signatures/nvidia-${suffix_short} cp -rp /lib/modules/${src_abi}-${flavour}/kernel/nvidia-${suffix_short}/bits \$(custom_dir)/${src_abi}-${flavour}/signatures/nvidia-${suffix_short} - ( \ - cd \$(custom_dir)/${src_abi}-${flavour}/signatures/nvidia-${suffix_short}/bits || exit 1; \ - sh BUILD unsigned || exit 1; \ - mv *.ko ..; \ + ( \\ + cd \$(custom_dir)/${src_abi}-${flavour}/signatures/nvidia-${suffix_short}/bits || exit 1; \\ + sh BUILD unsigned || exit 1; \\ + mv *.ko ..; \\ ) rm -rf \$(custom_dir)/${src_abi}-${flavour}/signatures/nvidia-${suffix_short}/bits EOL diff --git a/debian/scripts/gen-rules.lrs b/debian/scripts/gen-rules.lrs index e2ab3a1..f7f7648 100755 --- a/debian/scripts/gen-rules.lrs +++ b/debian/scripts/gen-rules.lrs @@ -76,10 +76,10 @@ do cat - >>"debian/rules.gen" <<EOL $targets:: - for stream in "${src_genr_version}/${src_abi}-${flavour}/signatures"/*; \ - do \ - nvidia=\$\$(basename "\$\$stream"); \ - echo "\$\$stream/* /lib/modules/${src_abi}-${flavour}/kernel/\$\$nvidia/bits" >>debian/linux-signatures-nvidia-${src_abi}-${flavour}.install; \ + for stream in "${src_genr_version}/${src_abi}-${flavour}/signatures"/*; \\ + do \\ + nvidia=\$\$(basename "\$\$stream"); \\ + echo "\$\$stream/* /lib/modules/${src_abi}-${flavour}/kernel/\$\$nvidia/bits" >>debian/linux-signatures-nvidia-${src_abi}-${flavour}.install; \\ done EOL
In places we use line continuation within a shell here document. These need to use double backslash in order to maintain the continuation in debian/rules.gen. Signed-off-by: Andy Whitcroft <apw@canonical.com> --- debian/scripts/gen-rules.lrg | 8 ++++---- debian/scripts/gen-rules.lrs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)