[apparmor] [patch 4/6] fix build issues on openSUSE

[Kees Cook]

ACK

On Thu, Oct 07, 2010 at 03:09:03PM -0700, Steve Beattie wrote:
> This corrects a couple of build issues on openSUSE, as the version of
> rpm there no longer defines %{_host_vendor}.
> ---
>  common/Make.rules |   15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
> 
> Index: b/common/Make.rules
> ===================================================================
> --- a/common/Make.rules
> +++ b/common/Make.rules
> @@ -48,16 +48,21 @@ BUILDDIR=$(shell if [ -d "${TESTBUILDDIR
>  		    echo "/tmp/${NAME}"  ; \
>  		  fi ;)
>  endif
> -RPMHOSTVENDOR=$(shell which rpm && rpm --eval "%{_host_vendor}")
>  ifndef DISTRO
>  DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \
>  		  echo slackware ; \
>  	       elif [ -f /etc/debian_version ] ; then \
>  	       	  echo debian ;\
> -	       elif [ ${RPMHOSTVENDOR} = "suse" ] ; then \
> -	          echo suse ;\
> -	       elif [ ${RPMHOSTVENDOR} = "redhat" ] ; then \
> -	          echo rhel4 ;\
> +	       elif which rpm > /dev/null ; then \
> +	         if [ "$(rpm --eval '0%{?suse_version}')" != "0" ] ; then \
> +	             echo suse ;\
> +	         elif [ "$(rpm --eval '%{_host_vendor}')" = redhat ] ; then \
> +	            echo rhel4 ;\
> +	         elif [ "$(rpm --eval '0%{?fedora}')" != "0" ] ; then \
> +	            echo rhel4 ;\
> +	         else \
> +	            echo unknown ;\
> +	         fi ;\
>  	       else \
>  	          echo unknown ;\
>  	       fi)
> 
> 
> -- 
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
-- 
Kees Cook
Ubuntu Security Team