Re: [devel-distro] Ситуация с firmware

[Konstantin Lepikhov <lakostis@unsafe.ru>]

[-- 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