diff mbox

[5/5] debian: override dh_clean to prevent *.orig from deleting (LP: #1201250)

Message ID 1392122997-8525-6-git-send-email-kengyu@canonical.com
State Rejected
Headers show

Commit Message

Keng-Yu Lin Feb. 11, 2014, 12:49 p.m. UTC
default dh_clean deletes all *.orig files.

The DSDT.dsl.orig, SSDT*.dsl.orig in fwts-test/disassemble-0001/
should not be deleted.

Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
---
 debian/rules | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Colin Ian King Feb. 11, 2014, 1:07 p.m. UTC | #1
On 11/02/14 12:49, Keng-Yu Lin wrote:
> default dh_clean deletes all *.orig files.
> 
> The DSDT.dsl.orig, SSDT*.dsl.orig in fwts-test/disassemble-0001/
> should not be deleted.
> 
> Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
> ---
>  debian/rules | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/debian/rules b/debian/rules
> index cd95821..0647cd6 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -19,6 +19,13 @@ override_dh_auto_install:
>  override_dh_dkms:
>  	dh_dkms -V $(VERSION)
>  
> +override_dh_clean:
> +	dh_clean -X fwts-test/disassemble-0001/DSDT.dsl.orig \
> +	-X fwts-test/disassemble-0001/SSDT0.dsl.orig \
> +	-X fwts-test/disassemble-0001/SSDT1.dsl.orig \
> +	-X fwts-test/disassemble-0001/SSDT2.dsl.orig \
> +	-X fwts-test/disassemble-0001/SSDT3.dsl.orig \
> +	-X fwts-test/disassemble-0001/SSDT4.dsl.orig
>  
>  %:
>  	dh $@ --with autoreconf,dkms
> 

Would it be easier if we just give the .orig files a different suffix
rather than try and workaround the issue with some dh overrides?  I
don't mind the file names being changed to make the debian/rules cleaner.

Colin
Keng-Yu Lin Feb. 11, 2014, 3:24 p.m. UTC | #2
I have no preference on which way is better.
I am happy to write another patch changing the suffix.

NAK this one.

On Tue, Feb 11, 2014 at 9:07 PM, Colin Ian King
<colin.king@canonical.com> wrote:
> On 11/02/14 12:49, Keng-Yu Lin wrote:
>> default dh_clean deletes all *.orig files.
>>
>> The DSDT.dsl.orig, SSDT*.dsl.orig in fwts-test/disassemble-0001/
>> should not be deleted.
>>
>> Signed-off-by: Keng-Yu Lin <kengyu@canonical.com>
>> ---
>>  debian/rules | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/debian/rules b/debian/rules
>> index cd95821..0647cd6 100755
>> --- a/debian/rules
>> +++ b/debian/rules
>> @@ -19,6 +19,13 @@ override_dh_auto_install:
>>  override_dh_dkms:
>>       dh_dkms -V $(VERSION)
>>
>> +override_dh_clean:
>> +     dh_clean -X fwts-test/disassemble-0001/DSDT.dsl.orig \
>> +     -X fwts-test/disassemble-0001/SSDT0.dsl.orig \
>> +     -X fwts-test/disassemble-0001/SSDT1.dsl.orig \
>> +     -X fwts-test/disassemble-0001/SSDT2.dsl.orig \
>> +     -X fwts-test/disassemble-0001/SSDT3.dsl.orig \
>> +     -X fwts-test/disassemble-0001/SSDT4.dsl.orig
>>
>>  %:
>>       dh $@ --with autoreconf,dkms
>>
>
> Would it be easier if we just give the .orig files a different suffix
> rather than try and workaround the issue with some dh overrides?  I
> don't mind the file names being changed to make the debian/rules cleaner.
>
> Colin
>
> --
> fwts-devel mailing list
> fwts-devel@lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/fwts-devel
diff mbox

Patch

diff --git a/debian/rules b/debian/rules
index cd95821..0647cd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,13 @@  override_dh_auto_install:
 override_dh_dkms:
 	dh_dkms -V $(VERSION)
 
+override_dh_clean:
+	dh_clean -X fwts-test/disassemble-0001/DSDT.dsl.orig \
+	-X fwts-test/disassemble-0001/SSDT0.dsl.orig \
+	-X fwts-test/disassemble-0001/SSDT1.dsl.orig \
+	-X fwts-test/disassemble-0001/SSDT2.dsl.orig \
+	-X fwts-test/disassemble-0001/SSDT3.dsl.orig \
+	-X fwts-test/disassemble-0001/SSDT4.dsl.orig
 
 %:
 	dh $@ --with autoreconf,dkms