[26009] in Source-Commits
Re: /svn/athena r25338 - trunk/athena/bin/machtype/debian
daemon@ATHENA.MIT.EDU (Jonathan Reed)
Mon Aug 1 16:28:29 2011
Mime-Version: 1.0 (Apple Message framework v1084)
Content-Type: text/plain; charset=us-ascii
From: Jonathan Reed <jdreed@MIT.EDU>
In-Reply-To: <201108010541.p715fOtK003145@drugstore.mit.edu>
Date: Mon, 1 Aug 2011 16:28:22 -0400
Cc: source-commits@mit.edu
Message-Id: <95046A35-1AB5-4B42-88BC-A3C960469080@mit.edu>
To: Geoffrey Thomas <geofft@mit.edu>
Content-Transfer-Encoding: 8bit
... why did you add yet another "ifeq ($(DISTRO),Ubuntu)" block instead of sticking the conditional in with the others?
-Jon
On Aug 1, 2011, at 1:41 AM, Geoffrey Thomas wrote:
> Author: geofft
> Date: 2011-08-01 01:41:24 -0400 (Mon, 01 Aug 2011)
> New Revision: 25338
>
> Modified:
> trunk/athena/bin/machtype/debian/changelog
> trunk/athena/bin/machtype/debian/rules
> Log:
> In machtype:
> * Support Debian 6.0 and Ubuntu 11.10.
>
>
> Modified: trunk/athena/bin/machtype/debian/changelog
> ===================================================================
> --- trunk/athena/bin/machtype/debian/changelog 2011-08-01 05:07:40 UTC (rev 25337)
> +++ trunk/athena/bin/machtype/debian/changelog 2011-08-01 05:41:24 UTC (rev 25338)
> @@ -1,3 +1,9 @@
> +debathena-machtype (10.0.2-0debathena5) unstable; urgency=low
> +
> + * Support Debian 6.0 and Ubuntu 11.10.
> +
> + -- Geoffrey Thomas <geofft@mit.edu> Mon, 01 Aug 2011 01:40:11 -0400
> +
> debathena-machtype (10.0.2-0debathena4) unstable; urgency=low
>
> * Support Ubuntu 11.04 (Trac #853)
>
> Modified: trunk/athena/bin/machtype/debian/rules
> ===================================================================
> --- trunk/athena/bin/machtype/debian/rules 2011-08-01 05:07:40 UTC (rev 25337)
> +++ trunk/athena/bin/machtype/debian/rules 2011-08-01 05:41:24 UTC (rev 25338)
> @@ -24,6 +24,16 @@
> endif
>
> ifeq ($(DISTRO),Ubuntu)
> + ifeq ($(call compare_ubuntu_version,11.10),y)
> + SYS_COMPAT += $(call arch_sysnames,amd64_ubuntu1110,i386_ubuntu1110)
> + endif
> +endif
> +
> +ifeq ($(call compare_debian_version,6),y)
> + SYS_COMPAT += $(call arch_sysnames,amd64_deb60,i386_deb60)
> +endif
> +
> +ifeq ($(DISTRO),Ubuntu)
> ifeq ($(call compare_ubuntu_version,11.04),y)
> SYS_COMPAT += $(call arch_sysnames,amd64_ubuntu1104,i386_ubuntu1104)
> endif
>
