From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <415AE74F.5050701@yandex.ru> Date: Wed, 29 Sep 2004 20:48:15 +0400 From: =?KOI8-R?Q?=EE=C5=CD=CF=D3?= User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.7.2) Gecko/20040808 X-Accept-Language: ru-ru, ru MIME-Version: 1.0 To: ALT Linux Sisyphus discussion list Subject: Re: [sisyphus] I: pentium4 arch support in rpm References: <20040928124441.GE20415@immo.ru> <4159631D.3060804@solin.spb.ru> <20040928131850.GF20415@immo.ru> In-Reply-To: <20040928131850.GF20415@immo.ru> X-Enigmail-Version: 0.84.2.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig2CCAD200D6A10D50292741A3" X-BeenThere: sisyphus@altlinux.ru X-Mailman-Version: 2.1.5 Precedence: list Reply-To: nemos-linux@yandex.ru, ALT Linux Sisyphus discussion list List-Id: ALT Linux Sisyphus discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Sep 2004 16:54:43 -0000 Archived-At: List-Archive: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig2CCAD200D6A10D50292741A3 Content-Type: multipart/mixed; boundary="------------030509040707070208080902" This is a multi-part message in MIME format. --------------030509040707070208080902 Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 8bit Alexey I. Froloff пишет: > * Aleksey Avdeev [040928 17:12]: > >>>По результатам удачного тестирования можно будет начинать >>>уговаривать ldv приложить этот патч, по результатам неудачного >>>тестирования - аттачте патчи для патча ;-) >> >> А подобный патч для altonXP встречается? > > Сделайте "по мотивам". У меня нет athlonXP под рукой. Попробовал, но не могу понять что я мог поломать своим патчем. При попытке собрать rpm с помощью нового пропатченого(ваш + мой патч) rpm выдает следующие в самом начале: ошибка: line 47: Dependency tokens must not contain '%<=>' symbols: BuildPreReq: python-devel = %__python_version т. е. еще на этапе проверки спека. Свой патч прилагаю. --------------030509040707070208080902 Content-Type: text/plain; name="add-athlonxp-support-to-rpm_with_pentium4_patch.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="add-athlonxp-support-to-rpm_with_pentium4_patch.patch" diff -urN rpm-4_0-4.0.4-orig/installplatform rpm-4_0-4.0.4/installplatform --- rpm-4_0-4.0.4-orig/installplatform 2004-09-29 20:03:06 +0400 +++ rpm-4_0-4.0.4/installplatform 2004-09-29 19:40:14 +0400 @@ -35,7 +35,7 @@ ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${OS} case "$arch" in - i[3456]86|k6|athlon|pentium4) SUBSTS='s_\(i[3456]86\|k6\|athlon|pentium4\)_i386_ s_\(i[3456]86\|k6\|athlon|pentium4\)_i486_ s_\(i[3456]86\|k6\|athlon|pentium4\)_i586_ s_\(i[3456]86\|k6\|athlon|pentium4\)_i686_ s_\(i[3456]86\|k6\|athlon|pentium4\)_k6_ s_\(i[3456]86\|k6\|athlon|pentium4\)_athlon_ s_\(i[3456]86\|k6\|athlon|pentium4\)_pentium4_' ;; + i[3456]86|k6|athlon|athlonxp|pentium4) SUBSTS='s_\(i[3456]86\|k6\|athlon|athlonxp|pentium4\)_i386_ s_\(i[3456]86\|k6\|athlon|athlonxp|pentium4\)_i486_ s_\(i[3456]86\|k6\|athlonxp|athlon|pentium4\)_i586_ s_\(i[3456]86\|k6\|athlon|athlonxp|pentium4\)_i686_ s_\(i[3456]86\|k6\|athlon|athlonxp|pentium4\)_k6_ s_\(i[3456]86\|k6\|athlon|athlonxp|pentium4\)_athlon_ s_\(i[3456]86\|k6\|athlon|athlonxp|pentium4\)_athlonxp_ s_\(i[3456]86\|k6\|athlon|athlonxp|pentium4\)_pentium4_' ;; alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;; sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;; powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6]\|$\)_ppc64\1_' ;; diff -urN rpm-4_0-4.0.4-orig/lib/rpmrc.c rpm-4_0-4.0.4/lib/rpmrc.c --- rpm-4_0-4.0.4-orig/lib/rpmrc.c 2004-09-29 20:03:06 +0400 +++ rpm-4_0-4.0.4/lib/rpmrc.c 2004-09-29 20:17:19 +0400 @@ -1045,6 +1045,9 @@ close( fd ); if ( strstr( buffer, "AMD" ) ) { + if ( strstr( buffer, "Athlon(tm) XP" ) ) + return "athlonxp"; + if ( strstr( buffer, "Athlon" ) || strstr( buffer, "Duron" ) ) return "athlon"; diff -urN rpm-4_0-4.0.4-orig/macros.in rpm-4_0-4.0.4/macros.in --- rpm-4_0-4.0.4-orig/macros.in 2004-09-29 20:03:06 +0400 +++ rpm-4_0-4.0.4/macros.in 2004-09-29 19:42:03 +0400 @@ -813,7 +813,7 @@ # conditionals. # %intel i386 i486 i586 i686 i786 i886 i986 pentium4 -%amd k6 athlon +%amd k6 athlon athlonxp %ix86 %intel %amd #------------------------------------------------------------------------ diff -urN rpm-4_0-4.0.4-orig/Makefile.am rpm-4_0-4.0.4/Makefile.am --- rpm-4_0-4.0.4-orig/Makefile.am 2004-09-29 20:03:06 +0400 +++ rpm-4_0-4.0.4/Makefile.am 2004-09-29 19:42:58 +0400 @@ -141,6 +141,7 @@ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i586 ;\ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i686 ;\ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon ;\ + $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/athlonxp ;\ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/pentium4 ;;\ alpha*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alpha ;\ $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alphaev6 ;;\ diff -urN rpm-4_0-4.0.4-orig/rpmrc.in rpm-4_0-4.0.4/rpmrc.in --- rpm-4_0-4.0.4-orig/rpmrc.in 2004-09-29 20:03:06 +0400 +++ rpm-4_0-4.0.4/rpmrc.in 2004-09-29 20:18:03 +0400 @@ -17,6 +17,7 @@ optflags: i686 %optflags_default -march=i686 optflags: k6 %optflags_default -march=k6 optflags: athlon %optflags_default -march=athlon +optflags: athlonxp %optflags_default -march=athlon-xp -mcpu=athlon-xp -msse -m3dnow -mmmx -mfpmath=sse optflags: pentium4 %optflags_default -march=pentium4 optflags: ia64 %optflags_default @@ -69,6 +70,7 @@ # Canonical arch names and numbers arch_canon: pentium4: pentium4 1 +arch_canon: athlonxp: athlonxp 1 arch_canon: athlon: athlon 1 arch_canon: i686: i686 1 arch_canon: k6: k6 1 @@ -167,6 +169,7 @@ buildarchtranslate: ia64: ia64 buildarchtranslate: pentium4: pentium4 +buildarchtranslate: athlonxp: athlonxp buildarchtranslate: athlon: athlon buildarchtranslate: i686: i686 buildarchtranslate: k6: k6 @@ -214,6 +217,7 @@ arch_compat: alpha: axp noarch arch_compat: pentium4: i686 +arch_compat: athlonxp: athlon arch_compat: athlon: i686 k6 arch_compat: i686: i586 arch_compat: k6: i586 @@ -302,6 +306,7 @@ buildarch_compat: ia64: noarch buildarch_compat: pentium4: i686 +buildarch_compat: athlonxp: athlon buildarch_compat: athlon: i686 k6 buildarch_compat: i686: i586 buildarch_compat: k6: i586 diff -urN rpm-4_0-4.0.4-orig/rpm.spec.in rpm-4_0-4.0.4/rpm.spec.in --- rpm-4_0-4.0.4-orig/rpm.spec.in 2004-09-29 20:03:06 +0400 +++ rpm-4_0-4.0.4/rpm.spec.in 2004-09-29 20:27:03 +0400 @@ -355,9 +355,10 @@ %attr(0644, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/rpmpopt* %attr(0644, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/rpmrc -%ifarch i386 i486 i586 i686 athlon pentium4 +%ifarch i386 i486 i586 i686 athlon athlonxp pentium4 %attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/i[3456]86* %attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/athlon* +%attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/athlonxp* %attr(-, @RPMUSER@, @RPMGROUP@) %{__prefix}/lib/rpm/pentium4* %endif %ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67 --------------030509040707070208080902-- --------------enig2CCAD200D6A10D50292741A3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFBWudZynzxTJycySERAl9AAKCrt5/6kXmc5+eKD837OdJ3th4UKwCgraxr w9pfjKYJ7CA9kyfcyusbtPw= =dskr -----END PGP SIGNATURE----- --------------enig2CCAD200D6A10D50292741A3--