[elbe-devel] [PATCH v3 7/8] docs: remove elbe-bootstrap from the documents

Torben Hohn torben.hohn at linutronix.de
Mon Oct 15 15:18:05 CEST 2018


elbe-bootstrap and <kinitrd> does not exist anymore.

remove <kinit> completely, and replace text about elbe-bootstrap
with a paragraph about mirroring of debian installer

Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
---
 docs/elbeoverview-en.txt | 33 +++++++++++----------------------
 docs/testspec.csv        |  2 +-
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/docs/elbeoverview-en.txt b/docs/elbeoverview-en.txt
index ffd6a735..322fae9c 100644
--- a/docs/elbeoverview-en.txt
+++ b/docs/elbeoverview-en.txt
@@ -203,9 +203,6 @@ source~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		</mirror>
 		<noauth />
 		<suite>wheezy</suite>
-		<buildimage>
-			<kinitrd>elbe-bootstrap</kinitrd>
-		</buildimage>
 	</project>
 	<target>
 		<hostname>myARM</hostname>
@@ -594,21 +591,20 @@ source~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			<size>20G</size>				<2>
 			<mem>256</mem>					<3>
 			<interpreter>qemu-system-arm</interpreter>	<4>
-			<kinitrd>elbe-bootstrap</kinitrd>		<5>
-			<console>ttyAMA0,115200n1</console>		<6>
-			<machine>versatilepb</machine>			<7>
+			<console>ttyAMA0,115200n1</console>		<5>
+			<machine>versatilepb</machine>			<6>
 			<NIC>
 				<model>smc91c111</model>
 				<MAC>de:ad:be:ef:be:05</MAC>
 			</NIC>
-			<portforwarding>				<8>
+			<portforwarding>				<7>
 				<forward>
 					<proto>tcp</proto>
 					<buildenv>22</buildenv>
 					<host>5022</host>
 				</forward>
 			</portforwarding>
-			<pkg-list>					<9>
+			<pkg-list>					<8>
 				<pkg>buildd</pkg>
 			</pkg-list>
 		</buildimage>
@@ -626,25 +622,19 @@ source~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Usage of kvm is usually only possible, when the target is 'x86'.
 		(optional)
 
-<5> The name of the elbe-bootstrap package.
-    All package sources mentioned in the XML file are scanned for this package.
-    It provides the debian-installer kernel and initrd. This package is not
-    hosted on official Debian mirrors. So it makes sense additional add the
-    <noauth/> tag to the <mirror> section.
-
-<6> The 'console' line needs special attention because it is different on
+<5> The 'console' line needs special attention because it is different on
     different emulation targets.
 		(optional)
 
-<7> The 'machine' tag contains the '-machine' parameter, that is provided to
+<6> The 'machine' tag contains the '-machine' parameter, that is provided to
     qemu.
 		(optional)
 
-<8> 'portforwarding' of network server ports from the virtual machine to the
+<7> 'portforwarding' of network server ports from the virtual machine to the
     host. This example forwards the ssh port to port 5022 on the host.
 		(optional)
 
-<9> This is the list of packages that are only installed to the buildimage.
+<8> This is the list of packages that are only installed to the buildimage.
      (The packages listed in the target sections pkg-list are installed to
      the target image and the buildimage.) It can be used for example to
      install the debian build server into the buildenvironment.
@@ -922,10 +912,9 @@ The 'elbe init' command generates a project directory, which contains a hard
 disk image for a virtual build machine and a 'Makefile' to install the build
 VM and to work with it.
 
-During this process, 'elbe init' will search the package repos mentioned in the
-mirror section of the XML file for the elbe-bootstrap package, which includes
-the debian-installer. You can use the packages provided by Linutronix from
-http://debian.linutronix.de/elbe by adding this url to the mirror section.
+During this process, 'elbe init' will download a linux kernel and initrd.gz
+from the debian mirror. In case of a local mirror, be sure, that
+`dists/jessie/main/installer-amd64/` is also mirrored.
 
 After 'elbe init' has generated the project directory, change to the
 project directory and run 'make'. This will start the installation of the
diff --git a/docs/testspec.csv b/docs/testspec.csv
index dcfef172..b984c325 100644
--- a/docs/testspec.csv
+++ b/docs/testspec.csv
@@ -2,7 +2,7 @@ ELBE TestSpec,,,,
 ,,,,
 #,Component,Functional Requirement,Test,Expectation
 1,debianization,Debian binary and source packages,build packages with pbuilder,"same number of binary packages as in previous test, one source package"
-2,,Debian Repository,build Debian repository with reprepro or aptly,Repo including all necessary packages (don't forget elbe-bootstrap)
+2,,Debian Repository,build Debian repository with reprepro or aptly,Repo including all necessary packages
 3,initvm create,build an initvm image,use absolute path for –directory,Makefile and buildenv.img at specified path
 4,,,use relative path for –directory,Makefile and buildenv.img at specified path
 5,,,use elbe initvm create without any parameter,Makefile and buildenv.img at default locations
-- 
2.11.0




More information about the elbe-devel mailing list