From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,WEIRD_PORT autolearn=no version=3.2.5 Date: Sun, 11 Nov 2012 22:11:36 +0200 From: Michael Shigorin To: devel-distro@lists.altlinux.org Message-ID: <20121111201135.GE19661@osdn.org.ua> Mail-Followup-To: devel-distro@lists.altlinux.org References: <20121111185832.GD19661@osdn.org.ua> <1352660909.2732.9@ildar.innovations.kz> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="cmJC7u66zC7hs+87" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1352660909.2732.9@ildar.innovations.kz> User-Agent: Mutt/1.4.2.1i Subject: Re: [devel-distro] =?koi8-r?b?bWtpbWFnZS1wcm9maWxlczog0NLPwszFzdk=?= X-BeenThere: devel-distro@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: shigorin@gmail.com, Distributions development List-Id: Distributions development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Nov 2012 20:11:40 -0000 Archived-At: List-Archive: --cmJC7u66zC7hs+87 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: 8bit On Mon, Nov 12, 2012 at 01:08:29AM +0600, Ildar Mulyukov wrote: > Я приложил оба патча. Но всё как раньше. Объясни, что делать дальше? > $ make syslinux.iso > ** ARCH: x86_64 > make[1]: *** [profile/populate] Ошибка 2 Отодвинул ~/.mkimage/profiles.mk с моим обычным DEBUG, вылезло. В логе: distcfg.mk:55: *** extraneous `endif'. Stop. Заглянул, удивился, сделал diff с distcfg.mk сборки при DEBUG=1 (прилагается). Обалдел. git bisect оперативно дал: 307fb51f1535b5f2d4915bd5247c5865544291cd is the first bad commit И вот уже только разглядывая его -- понял, что distro/syslinux нынче определяется в conf.d/test.mk, где первой значащей строчкой стоит ifneq (,$(DEBUG))... Спасибо, перенёс назад в conf.d/live.mk; патчик прилагается, хотя, пожалуй, следом пойдёт и обновление в git.alt/Sisyphus. -- ---- WBR, Michael Shigorin ------ Linux.Kiev http://www.linux.kiev.ua/ --cmJC7u66zC7hs+87 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="distcfg.mk.diff" --- /tmp/.private/mike/mkimage-profiles.build.LwkpasY/distcfg.mk 2012-11-11 23:25:14.503063061 +0400 +++ build/distcfg.mk 2012-11-11 23:30:04.139184496 +0400 @@ -33,23 +33,15 @@ # use/build-distro FEATURES += build-distro # config/name/syslinux -#IMAGE_NAME = syslinux # overridden by config/name/syslinux +IMAGE_NAME = syslinux # use/pack FEATURES += pack # boot/isolinux -#BOOTLOADER = isolinux # overridden by boot/isolinux -# use/pack/iso -#IMAGE_PACKTYPE = isoboot # overridden by use/pack/iso -# config/pack/iso -#IMAGE_TYPE = iso # overridden by config/pack/iso -# profile/finalize -SUBPROFILE_DIRS = $(notdir $(subst @,/,$(SUBPROFILES))) -endif -FEATURES += build-distro -IMAGE_NAME = syslinux -FEATURES += pack BOOTLOADER = isolinux +# use/pack/iso IMAGE_PACKTYPE = isoboot +# config/pack/iso IMAGE_TYPE = iso +# profile/finalize SUBPROFILE_DIRS = $(notdir $(subst @,/,$(SUBPROFILES))) endif --cmJC7u66zC7hs+87 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-moved-distro-syslinux-from-test.mk-back-to-live.mk.patch" >>From ad3ad591cc9913def26516360f624adfe80cfe55 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sun, 11 Nov 2012 23:52:05 +0400 Subject: [PATCH] moved distro/syslinux from test.mk back to live.mk Thanks go to ildar@ for spotting this: my ~/.mkimage/profiles.mk routinely contains DEBUG = 1 line which effectively masked this regression in commit 307fb51f1535b5f2d4915bd5247c5865544291cd. Wouldn't be a big deal but syslinux.iso is recommended in tutorial docs being slim and fast-building, and it's also what's buildable locally in live-builder.iso environment. --- conf.d/live.mk | 2 ++ conf.d/test.mk | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conf.d/live.mk b/conf.d/live.mk index 41c22b1..9ee270e 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -3,6 +3,8 @@ ifeq (distro,$(IMAGE_CLASS)) distro/dos: distro/.init use/dos use/syslinux/ui/menu; @: distro/rescue: distro/.base use/rescue use/syslinux/ui/menu; @: +distro/syslinux: distro/.init \ + use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @: distro/.live-base: distro/.base use/live/base use/power/acpi/button; @: distro/.live-desktop: distro/.base +live use/plymouth/live; @: diff --git a/conf.d/test.mk b/conf.d/test.mk index ed58672..6277879 100644 --- a/conf.d/test.mk +++ b/conf.d/test.mk @@ -3,9 +3,6 @@ ifneq (,$(DEBUG)) ifeq (distro,$(IMAGE_CLASS)) -distro/syslinux: distro/.init \ - use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @: - distro/syslinux-auto: distro/.init use/hdt use/syslinux/timeout/1; @: distro/syslinux-noescape: distro/syslinux-auto use/syslinux/noescape.cfg; @: -- 1.7.12.4 --cmJC7u66zC7hs+87--