[24364] in Source-Commits
/svn/athena r23962 - trunk/athena/bin/machtype/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Thu Aug 13 02:03:19 2009
Date: Thu, 13 Aug 2009 02:03:10 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200908130603.n7D63Aqf011157@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-08-13 02:03:10 -0400 (Thu, 13 Aug 2009)
New Revision: 23962
Modified:
trunk/athena/bin/machtype/debian/changelog
trunk/athena/bin/machtype/debian/rules
Log:
In machtype:
* Remove some crufty (and likely incompatible) sysnames from the
compatibility list.
Modified: trunk/athena/bin/machtype/debian/changelog
===================================================================
--- trunk/athena/bin/machtype/debian/changelog 2009-08-10 02:51:35 UTC (rev 23961)
+++ trunk/athena/bin/machtype/debian/changelog 2009-08-13 06:03:10 UTC (rev 23962)
@@ -1,3 +1,10 @@
+debathena-machtype (10.0.1-0debathena3) unstable; urgency=low
+
+ * Remove some crufty (and likely incompatible) sysnames from the
+ compatibility list.
+
+ -- Evan Broder <broder@mit.edu> Sat, 08 Aug 2009 19:08:54 -0700
+
debathena-machtype (10.0.1-0debathena2) unstable; urgency=low
* Switch back to architecture: any - the sysnames are calculated at
Modified: trunk/athena/bin/machtype/debian/rules
===================================================================
--- trunk/athena/bin/machtype/debian/rules 2009-08-10 02:51:35 UTC (rev 23961)
+++ trunk/athena/bin/machtype/debian/rules 2009-08-13 06:03:10 UTC (rev 23962)
@@ -39,20 +39,8 @@
endif
endif
-ifeq ($(shell dpkg --compare-versions $(DEBIAN_VERSION) '>=' '3.1' && echo y),y)
- ifeq ($(DEB_BUILD_ARCH),amd64)
- SYS_COMPAT += amd64_deb31 i386_deb31
- else
- ifeq ($(DEB_BUILD_ARCH),i386)
- SYS_COMPAT += i386_deb31
- else
- $(error Unrecognized architecture $(DEB_BUILD_ARCH))
- endif
- endif
-endif
+SYS_COMPAT += i386_rhel3 i386_linux24
-SYS_COMPAT += i386_rhel3 i386_rh9 i386_linux24 i386_linux22 i386_linux3 i386_linux2 i386_linux1
-
ATHENA_SYS = $(word 1, $(SYS_COMPAT))
ATHENA_SYS_COMPAT = $(patsubst %:,%,$(subst : ,:,$(patsubst %,%:,$(wordlist 2, $(words $(SYS_COMPAT)), $(SYS_COMPAT)))))
