From owner-freebsd-current@FreeBSD.ORG Fri Aug 27 00:50:26 2010 Return-Path: Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EF0631065674; Fri, 27 Aug 2010 00:50:26 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [IPv6:2001:470:a803::1]) by mx1.freebsd.org (Postfix) with ESMTP id 3145B8FC0C; Fri, 27 Aug 2010 00:50:26 +0000 (UTC) Received: from mail.geekcn.org (tarsier.geekcn.org [211.166.10.233]) by tarsier.geekcn.org (Postfix) with ESMTP id 0A0DDA6045E; Fri, 27 Aug 2010 08:50:25 +0800 (CST) X-Virus-Scanned: amavisd-new at geekcn.org Received: from tarsier.geekcn.org ([211.166.10.233]) by mail.geekcn.org (mail.geekcn.org [211.166.10.233]) (amavisd-new, port 10024) with LMTP id EW4kt63j2FmH; Fri, 27 Aug 2010 08:50:19 +0800 (CST) Received: from delta.delphij.net (drawbridge.ixsystems.com [206.40.55.65]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTPSA id 6B070A5FC43; Fri, 27 Aug 2010 08:50:12 +0800 (CST) DomainKey-Signature: a=rsa-sha1; s=default; d=delphij.net; c=nofws; q=dns; h=message-id:date:from:reply-to:organization:user-agent: mime-version:to:cc:subject:x-enigmail-version:openpgp:content-type; b=I4GHk3HimcDBLUAG8LaIoDFV6qKm7x+6aq4BT7NBfKdKxnvDg59Ulu0PL+ZGm50Zv DJ78y7knKGwp9G7VikFgw== Message-ID: <4C770BB9.2070900@delphij.net> Date: Thu, 26 Aug 2010 17:50:01 -0700 From: Xin LI Organization: The Geek China Organization User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.1.11) Gecko/20100721 Thunderbird/3.0.6 ThunderBrowse/3.3.2 MIME-Version: 1.0 To: FreeBSD Current X-Enigmail-Version: 1.0.1 OpenPGP: id=3FCA37C1; url=http://www.delphij.net/delphij.asc Content-Type: multipart/mixed; boundary="------------050307080802070809060606" Cc: Subject: [PATCH] Use MACHINE_ARCH for boot loader X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: d@delphij.net List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Aug 2010 00:50:27 -0000 This is a multi-part message in MIME format. --------------050307080802070809060606 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, The attached patch changes FreeBSD/x86 back to FreeBSD/i386 on i386 and FreeBSD/amd64 on amd64. Comments welcome! I'll commit it in by the weekend if there is no objection on this. Cheers, - -- Xin LI http://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (FreeBSD) iQEcBAEBCAAGBQJMdwu5AAoJEATO+BI/yjfBe+4H/i/LVqSlVP4XbQ8Xfzs2x0Xr pv+sOtSMOKOBmtKb6KrTxyZ/GyLTAxxERlJCDLuxFZ1fVZ+E+q3BrhNRyJGcCjYx 6B3gdFwgiOlZbbFw/FGrI0W32xbeTnzd4oHqZWli4Nn6L7h+smX+O11aFaAg4ktG y8E3ngJrG3ublbUskJ6/Vbi2xIbkTt0iPPa7jZlGGU2rTrLGTtB7E/5GNIXbiOWe NwfKW+c2vaNCWTzwrUM/jHAkVgM3ZFXVEwx0BFGuhY4Rc2z5sGLwvpbueNT7xkTv Y6goyuw6vwxnxA6ps2eka38Dz1JsoDNXsdFgpkgEF57c1hROSHF39lJhIfEB5t8= =HL2J -----END PGP SIGNATURE----- --------------050307080802070809060606 Content-Type: text/plain; name="boot.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="boot.diff" SW5kZXg6IHN5cy9ib290L2kzODYvYm9vdDIvYm9vdDIuYwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBz eXMvYm9vdC9pMzg2L2Jvb3QyL2Jvb3QyLmMJKHJldmlzaW9uIDIxMTg0NykKKysrIHN5cy9i b290L2kzODYvYm9vdDIvYm9vdDIuYwkod29ya2luZyBjb3B5KQpAQCAtMjgzLDcgKzI4Myw3 IEBAIG1haW4odm9pZCkKIAogICAgIGZvciAoOzspIHsKIAlpZiAoIWF1dG9ib290IHx8ICFP UFRfQ0hFQ0soUkJYX1FVSUVUKSkKLQkgICAgcHJpbnRmKCJcbkZyZWVCU0QveDg2IGJvb3Rc biIKKwkgICAgcHJpbnRmKCJcbkZyZWVCU0QvIiBNQUNISU5FX0FSQ0ggIiBib290XG4iCiAJ CSAgICJEZWZhdWx0OiAldTolcygldSwlYyklc1xuIgogCQkgICAiYm9vdDogIiwKIAkJICAg ZHNrLmRyaXZlICYgRFJWX01BU0ssIGRldl9ubVtkc2sudHlwZV0sIGRzay51bml0LApJbmRl eDogc3lzL2Jvb3QvaTM4Ni9ib290Mi9NYWtlZmlsZQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzeXMv Ym9vdC9pMzg2L2Jvb3QyL01ha2VmaWxlCShyZXZpc2lvbiAyMTE4NDcpCisrKyBzeXMvYm9v dC9pMzg2L2Jvb3QyL01ha2VmaWxlCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw2ICszNCw3IEBA IENGTEFHUz0JLU9zIFwKIAktbW5vLW1teCAtbW5vLTNkbm93IC1tbm8tc3NlIC1tbm8tc3Nl MiAtbW5vLXNzZTMgXAogCS1EJHtCT09UMl9VRlN9IFwKIAktREZMQUdTPSR7Qk9PVF9CT09U MV9GTEFHU30gXAorCS1ETUFDSElORV9BUkNIPVwiJHtNQUNISU5FX0FSQ0h9XCIgXAogCS1E U0lPUFJUPSR7Qk9PVF9DT01DT05TT0xFX1BPUlR9IFwKIAktRFNJT0ZNVD0ke0IyU0lPRk1U fSBcCiAJLURTSU9TUEQ9JHtCT09UX0NPTUNPTlNPTEVfU1BFRUR9IFwKSW5kZXg6IHN5cy9i b290L2kzODYvemZzYm9vdC96ZnNib290LmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3lzL2Jvb3Qv aTM4Ni96ZnNib290L3pmc2Jvb3QuYwkocmV2aXNpb24gMjExODQ3KQorKysgc3lzL2Jvb3Qv aTM4Ni96ZnNib290L3pmc2Jvb3QuYwkod29ya2luZyBjb3B5KQpAQCAtNzMxLDcgKzczMSw3 IEBAIG1haW4odm9pZCkKIAogICAgIGZvciAoOzspIHsKIAlpZiAoIWF1dG9ib290IHx8ICFP UFRfQ0hFQ0soUkJYX1FVSUVUKSkKLQkgICAgcHJpbnRmKCJcbkZyZWVCU0QveDg2IGJvb3Rc biIKKwkgICAgcHJpbnRmKCJcbkZyZWVCU0QvIiBNQUNISU5FX0FSQ0ggIiBib290XG4iCiAJ CSAgICJEZWZhdWx0OiAlczolc1xuIgogCQkgICAiYm9vdDogIiwKIAkJICAgc3BhLT5zcGFf bmFtZSwga25hbWUpOwpJbmRleDogc3lzL2Jvb3QvaTM4Ni96ZnNib290L01ha2VmaWxlCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIHN5cy9ib290L2kzODYvemZzYm9vdC9NYWtlZmlsZQkocmV2aXNp b24gMjExODQ3KQorKysgc3lzL2Jvb3QvaTM4Ni96ZnNib290L01ha2VmaWxlCSh3b3JraW5n IGNvcHkpCkBAIC0yNiw2ICsyNiw3IEBAIENGTEFHUz0JLU9zIC1nIFwKIAktbW5vLW1teCAt bW5vLTNkbm93IC1tbm8tc3NlIC1tbm8tc3NlMiAtbW5vLXNzZTMgXAogCS1EQk9PVDIgXAog CS1ERkxBR1M9JHtCT09UX0JPT1QxX0ZMQUdTfSBcCisJLURNQUNISU5FX0FSQ0g9XCIke01B Q0hJTkVfQVJDSH1cIiBcCiAJLURTSU9QUlQ9JHtCT09UX0NPTUNPTlNPTEVfUE9SVH0gXAog CS1EU0lPRk1UPSR7QjJTSU9GTVR9IFwKIAktRFNJT1NQRD0ke0JPT1RfQ09NQ09OU09MRV9T UEVFRH0gXApJbmRleDogc3lzL2Jvb3QvaTM4Ni96ZnNsb2FkZXIvTWFrZWZpbGUKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gc3lzL2Jvb3QvaTM4Ni96ZnNsb2FkZXIvTWFrZWZpbGUJKHJldmlzaW9u IDIxMTg0NykKKysrIHN5cy9ib290L2kzODYvemZzbG9hZGVyL01ha2VmaWxlCSh3b3JraW5n IGNvcHkpCkBAIC0zLDcgKzMsNyBAQAogLlBBVEg6CSR7LkNVUkRJUn0vLi4vbG9hZGVyCiAK IExPQURFUj0JCXpmc2xvYWRlcgotTkVXVkVSU1dIQVQ9CSJaRlMgZW5hYmxlZCBib290c3Ry YXAgbG9hZGVyIiBpMzg2CitORVdWRVJTV0hBVD0JIlpGUyBlbmFibGVkIGJvb3RzdHJhcCBs b2FkZXIiICR7TUFDSElORV9BUkNIfQogTE9BREVSX1pGU19TVVBQT1JUPXllcwogTE9BREVS X09OTFk9CXllcwogTk9fTUFOPQkJeWVzCkluZGV4OiBzeXMvYm9vdC9pMzg2L2xvYWRlci9N YWtlZmlsZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzeXMvYm9vdC9pMzg2L2xvYWRlci9NYWtlZmls ZQkocmV2aXNpb24gMjExODQ3KQorKysgc3lzL2Jvb3QvaTM4Ni9sb2FkZXIvTWFrZWZpbGUJ KHdvcmtpbmcgY29weSkKQEAgLTYsNyArNiw3IEBAIE1LX1NTUD0JCW5vCiBMT0FERVI/PQls b2FkZXIKIFBST0c9CQkke0xPQURFUn0uc3ltCiBJTlRFUk5BTFBST0c9Ci1ORVdWRVJTV0hB VD89CSJib290c3RyYXAgbG9hZGVyIiBpMzg2CitORVdWRVJTV0hBVD89CSJib290c3RyYXAg bG9hZGVyIiAke01BQ0hJTkVfQVJDSH0KIAogIyBhcmNoaXRlY3R1cmUtc3BlY2lmaWMgbG9h ZGVyIGNvZGUKIFNSQ1M9CQltYWluLmMgY29uZi5jIHZlcnMuYwpJbmRleDogc3lzL2Jvb3Qv aTM4Ni9ncHRib290L2dwdGJvb3QuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzeXMvYm9vdC9pMzg2 L2dwdGJvb3QvZ3B0Ym9vdC5jCShyZXZpc2lvbiAyMTE4NDcpCisrKyBzeXMvYm9vdC9pMzg2 L2dwdGJvb3QvZ3B0Ym9vdC5jCSh3b3JraW5nIGNvcHkpCkBAIC0yODEsNyArMjgxLDcgQEAg bWFpbih2b2lkKQogCiAgICAgZm9yICg7OykgewogCWlmICghYXV0b2Jvb3QgfHwgIU9QVF9D SEVDSyhSQlhfUVVJRVQpKQotCSAgICBwcmludGYoIlxuRnJlZUJTRC94ODYgYm9vdFxuIgor CSAgICBwcmludGYoIlxuRnJlZUJTRC8iIE1BQ0hJTkVfQVJDSCAiIGJvb3RcbiIKIAkJICAg IkRlZmF1bHQ6ICV1OiVzKCV1cCV1KSVzXG4iCiAJCSAgICJib290OiAiLAogCQkgICBkc2su ZHJpdmUgJiBEUlZfTUFTSywgZGV2X25tW2Rzay50eXBlXSwgZHNrLnVuaXQsCkluZGV4OiBz eXMvYm9vdC9pMzg2L2dwdGJvb3QvTWFrZWZpbGUKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gc3lzL2Jv b3QvaTM4Ni9ncHRib290L01ha2VmaWxlCShyZXZpc2lvbiAyMTE4NDcpCisrKyBzeXMvYm9v dC9pMzg2L2dwdGJvb3QvTWFrZWZpbGUJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDcg QEAgQ0ZMQUdTPQktT3MgXAogCS1tcnRkIFwKIAktbW5vLW1teCAtbW5vLTNkbm93IC1tbm8t c3NlIC1tbm8tc3NlMiAtbW5vLXNzZTMgXAogCS1EJHtHUFRCT09UX1VGU30gXAorCS1ETUFD SElORV9BUkNIPVwiJHtNQUNISU5FX0FSQ0h9XCIgXAogCS1EU0lPUFJUPSR7Qk9PVF9DT01D T05TT0xFX1BPUlR9IFwKIAktRFNJT0ZNVD0ke0IyU0lPRk1UfSBcCiAJLURTSU9TUEQ9JHtC T09UX0NPTUNPTlNPTEVfU1BFRUR9IFwK --------------050307080802070809060606--