From: Thierry Parmentelat Date: Mon, 9 May 2011 08:42:48 +0000 (+0200) Subject: the kernel rebuilt on f14 crashes at startup - use the one (same sources) that was... X-Git-Tag: 5.0-rc22~88 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=af8fbc1bdebaf5cae8bc83c35d2b871c724d2bca;p=build.git the kernel rebuilt on f14 crashes at startup - use the one (same sources) that was built on f12 force yum version to be higher than the one currently shipping with f14 --- diff --git a/f14-tags.mk b/f14-tags.mk index 35f86bb1..6e0bf348 100644 --- a/f14-tags.mk +++ b/f14-tags.mk @@ -1,10 +1,10 @@ -# don't bother to upgrade -linux-2.6-BRANCH := f12 -linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6.32-f12 -kernel-DEVEL-RPMS += elfutils-libelf-devel -kernel-DEVEL-RPMS += e2fsprogs -kernel-DEVEL-RPMS += xmlto -kernel-DEVEL-RPMS += asciidoc +### # don't bother to upgrade +### linux-2.6-BRANCH := f12 +### linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6.32-f12 +### kernel-DEVEL-RPMS += elfutils-libelf-devel +### kernel-DEVEL-RPMS += e2fsprogs +### kernel-DEVEL-RPMS += xmlto +### kernel-DEVEL-RPMS += asciidoc #util-vserver-BRANCH := f12 #util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@f12-bbox-f14 util-vserver-GITPATH := git://git.planet-lab.eu/util-vserver.git@util-vserver-0.30.216-15 @@ -12,6 +12,6 @@ util-vserver-DEVEL-RPMS += nss nss-devel util-vserver-DEVEL-RPMS += dietlibc # but use latest stuff for f12 that has 3.2.28 yum-BRANCH := f12 -yum-GITPATH := git://git.onelab.eu/yum.git@3.2.28-5-f1x +yum-GITPATH := git://git.onelab.eu/yum.git@3.2.28-99-f1x yum-DEVEL-RPMS += gettext yum-DEVEL-RPMS += intltool diff --git a/f14.mk b/f14.mk index f5016d82..b3efca5b 100644 --- a/f14.mk +++ b/f14.mk @@ -15,7 +15,8 @@ kernel-RPMFLAGS:= --target $(HOSTARCH) endif # the defaults below are built into the specfile #kernel-RPMFLAGS += --with firmware --without doc --without-debug -ALL += kernel +# do not rebuild on f14, as this crashes, use the one built on f12 instead (go figure) +###ALL += kernel # # util-vserver