[xenial/master-next,1/2] UBUNTU: [Packaging] final-checks -- remove check for empty retpoline files

Message ID 20180403165249.15489-9-apw@canonical.com
State New
Headers show
Series
  • [xenial/master-next,1/2] UBUNTU: [Packaging] final-checks -- remove check for empty retpoline files
Related show

Commit Message

Andy Whitcroft April 3, 2018, 4:52 p.m.
From: Seth Forshee <seth.forshee@canonical.com>

With the new support for removing known safe retpoline sequences
from the ones which were detected it is now completely valid to
end up with an empty retpoline file in the abi. Remove the
check for empty retpoline files so this will not cause an error.

BugLink: http://bugs.launchpad.net/bugs/1758856
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian/scripts/misc/final-checks | 5 -----
 1 file changed, 5 deletions(-)

Comments

Juerg Haefliger April 4, 2018, 6:38 a.m. | #1
On 04/03/2018 06:52 PM, Andy Whitcroft wrote:
> From: Seth Forshee <seth.forshee@canonical.com>
> 
> With the new support for removing known safe retpoline sequences
> from the ones which were detected it is now completely valid to
> end up with an empty retpoline file in the abi. Remove the
> check for empty retpoline files so this will not cause an error.
> 
> BugLink: http://bugs.launchpad.net/bugs/1758856
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
> Signed-off-by: Andy Whitcroft <apw@canonical.com>

Acked-by: Juerg Haefliger <juergh@canonical.com>


> ---
>  debian/scripts/misc/final-checks | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks
> index aec25770ea1b..548dea99e6a0 100755
> --- a/debian/scripts/misc/final-checks
> +++ b/debian/scripts/misc/final-checks
> @@ -41,11 +41,6 @@ abi_check()
>  	then
>  		failure "$arch/$flavour ABI retpoline file missing"
>  	fi
> -
> -	if [ -f "$abidir/$flavour.retpoline" -a \
> -	     ! -s "$abidir/$flavour.retpoline" ]; then
> -		failure "$arch/$flavour ABI retpoline file empty -- must regenerate or ignore"
> -	fi
>  }
>  
>  for arch in $archs
>
Stefan Bader April 4, 2018, 9:53 a.m. | #2
On 03.04.2018 18:52, Andy Whitcroft wrote:
> From: Seth Forshee <seth.forshee@canonical.com>
> 
> With the new support for removing known safe retpoline sequences
> from the ones which were detected it is now completely valid to
> end up with an empty retpoline file in the abi. Remove the
> check for empty retpoline files so this will not cause an error.
> 
> BugLink: http://bugs.launchpad.net/bugs/1758856
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>

> ---
>  debian/scripts/misc/final-checks | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks
> index aec25770ea1b..548dea99e6a0 100755
> --- a/debian/scripts/misc/final-checks
> +++ b/debian/scripts/misc/final-checks
> @@ -41,11 +41,6 @@ abi_check()
>  	then
>  		failure "$arch/$flavour ABI retpoline file missing"
>  	fi
> -
> -	if [ -f "$abidir/$flavour.retpoline" -a \
> -	     ! -s "$abidir/$flavour.retpoline" ]; then
> -		failure "$arch/$flavour ABI retpoline file empty -- must regenerate or ignore"
> -	fi
>  }
>  
>  for arch in $archs
>
Kleber Souza April 5, 2018, 8:15 a.m. | #3
On 04/03/18 18:52, Andy Whitcroft wrote:
> From: Seth Forshee <seth.forshee@canonical.com>
> 
> With the new support for removing known safe retpoline sequences
> from the ones which were detected it is now completely valid to
> end up with an empty retpoline file in the abi. Remove the
> check for empty retpoline files so this will not cause an error.
> 
> BugLink: http://bugs.launchpad.net/bugs/1758856
> Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
> ---
>  debian/scripts/misc/final-checks | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks
> index aec25770ea1b..548dea99e6a0 100755
> --- a/debian/scripts/misc/final-checks
> +++ b/debian/scripts/misc/final-checks
> @@ -41,11 +41,6 @@ abi_check()
>  	then
>  		failure "$arch/$flavour ABI retpoline file missing"
>  	fi
> -
> -	if [ -f "$abidir/$flavour.retpoline" -a \
> -	     ! -s "$abidir/$flavour.retpoline" ]; then
> -		failure "$arch/$flavour ABI retpoline file empty -- must regenerate or ignore"
> -	fi
>  }
>  
>  for arch in $archs
> 

Applied to xenial/master-next branch.

Thanks,
Kleber

Patch

diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks
index aec25770ea1b..548dea99e6a0 100755
--- a/debian/scripts/misc/final-checks
+++ b/debian/scripts/misc/final-checks
@@ -41,11 +41,6 @@  abi_check()
 	then
 		failure "$arch/$flavour ABI retpoline file missing"
 	fi
-
-	if [ -f "$abidir/$flavour.retpoline" -a \
-	     ! -s "$abidir/$flavour.retpoline" ]; then
-		failure "$arch/$flavour ABI retpoline file empty -- must regenerate or ignore"
-	fi
 }
 
 for arch in $archs