From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.1 Date: Mon, 23 May 2016 11:16:04 +0200 From: Konstantin Lepikhov To: Distributions development Message-ID: <20160523091604.GA8363@lks.home> Mail-Followup-To: Distributions development References: <20160522195720.GA14238@lks.home> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Kj7319i9nmIyA2yE" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20160522195720.GA14238@lks.home> X-Operation-System: ALT Linux starter kit (Trientalis) 4.6.0-lks-wks-alt0.1 User-Agent: Mutt/1.6 (2015-08-30) Subject: Re: [devel-distro] =?utf-8?b?0KHQuNGC0YPQsNGG0LjRjyDRgSBmaXJtd2FyZQ==?= X-BeenThere: devel-distro@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Distributions development List-Id: Distributions development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 May 2016 09:16:08 -0000 Archived-At: List-Archive: --Kj7319i9nmIyA2yE Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit On 05/22/16, at 09:57:20 PM you wrote: > Нельзя положить файлы в stage2 > ------------------------------ > > Если запаковывать это нельзя, то есть ли простой способ положить это в > stage2? Я пробовал добавлять директорию в параметр COPY_TREE, но, похоже, > этот параметр просто игнорируется при сборке stage2. > > Идеи? Это победил, пачт прикладываю. -- WBR et al. --Kj7319i9nmIyA2yE Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="0001-sub.in-stage2-Added-copy-tree-to-stage2.patch" >>From b740b4867be3251266acfb95d6a86e37a469325f Mon Sep 17 00:00:00 2001 From: "Konstantin A. Lepikhov" Date: Mon, 23 May 2016 11:10:22 +0200 Subject: [PATCH] sub.in/stage2: Added copy-tree to stage2 stage2 only allows to run certain scripts and install packages, but sometimes one need just to copy something to stage2 (like stage1 does). How to use: put files under ./files directory with the same structure as on resulting image. --- sub.in/stage2/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sub.in/stage2/Makefile b/sub.in/stage2/Makefile index 9fccca9..f124dfc 100644 --- a/sub.in/stage2/Makefile +++ b/sub.in/stage2/Makefile @@ -13,6 +13,10 @@ include $(GLOBAL_BUILDDIR)/distcfg.mk include $(GLOBAL_BUILDDIR)/functions.mk include $(MKIMAGE_PREFIX)/config.mk +COPY_TREE = ./files + +include $(MKIMAGE_PREFIX)/targets.mk + # this might have been prepared # by features.in/stage2/stage1/scripts.d/03-test-kernel -include $(GLOBAL_BUILDDIR)/squashcfg.mk @@ -57,7 +61,7 @@ include $(MKIMAGE_PREFIX)/targets.mk GLOBAL_CLEANUP_PACKAGES := $(CLEANUP_PACKAGES) all: | $(GLOBAL_DEBUG) \ - build-image run-image-scripts run-scripts pack-image \ + build-image run-image-scripts copy-tree run-scripts pack-image \ $(GLOBAL_CLEAN_WORKDIR) # dummy -- 2.7.4 --Kj7319i9nmIyA2yE--