From: Konstantin Lepikhov <lakostis@unsafe.ru> To: Distributions development <devel-distro@lists.altlinux.org> Subject: Re: [devel-distro] Ситуация с firmware Date: Mon, 23 May 2016 11:16:04 +0200 Message-ID: <20160523091604.GA8363@lks.home> (raw) In-Reply-To: <20160522195720.GA14238@lks.home> [-- Attachment #1: Type: text/plain, Size: 569 bytes --] On 05/22/16, at 09:57:20 PM you wrote: <skip> > Нельзя положить файлы в stage2 > ------------------------------ > > Если запаковывать это нельзя, то есть ли простой способ положить это в > stage2? Я пробовал добавлять директорию в параметр COPY_TREE, но, похоже, > этот параметр просто игнорируется при сборке stage2. > > Идеи? Это победил, пачт прикладываю. -- WBR et al. [-- Attachment #2: 0001-sub.in-stage2-Added-copy-tree-to-stage2.patch --] [-- Type: text/x-patch, Size: 1331 bytes --] >From b740b4867be3251266acfb95d6a86e37a469325f Mon Sep 17 00:00:00 2001 From: "Konstantin A. Lepikhov" <lakostis@altlinux.ru> 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
next prev parent reply other threads:[~2016-05-23 9:16 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-22 19:57 Konstantin Lepikhov 2016-05-23 9:16 ` Konstantin Lepikhov [this message] 2016-05-23 14:02 ` Michael Shigorin 2016-05-23 15:31 ` Konstantin Lepikhov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160523091604.GA8363@lks.home \ --to=lakostis@unsafe.ru \ --cc=devel-distro@lists.altlinux.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
ALT Linux Distributions development This inbox may be cloned and mirrored by anyone: git clone --mirror http://lore.altlinux.org/devel-distro/0 devel-distro/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 devel-distro devel-distro/ http://lore.altlinux.org/devel-distro \ devel-distro@lists.altlinux.org devel-distro@lists.altlinux.ru devel-distro@lists.altlinux.com public-inbox-index devel-distro Example config snippet for mirrors. Newsgroup available over NNTP: nntp://lore.altlinux.org/org.altlinux.lists.devel-distro AGPL code for this site: git clone https://public-inbox.org/public-inbox.git