From f5a661c0d4f4af0923c63e1944f7711c9d3a8f5e Mon Sep 17 00:00:00 2001 From: codehelp Date: Sat, 17 Apr 2010 21:25:42 +0000 Subject: [PATCH] Add cascading configuration to support standard Emdebian cross architectures. git-svn-id: http://emdebian.org/svn/current@7109 563faec7-e20c-0410-992a-a66f704d0ccd --- cross/armel.conf | 11 +++++++++++ crosschroot.conf => cross/crosschroot.conf | 6 ------ cross/mips.conf | 8 ++++++++ cross/mipsel.conf | 8 ++++++++ cross/powerpc.conf | 8 ++++++++ debian/changelog | 4 +++- debian/control | 9 +++------ 7 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 cross/armel.conf rename crosschroot.conf => cross/crosschroot.conf (85%) create mode 100644 cross/mips.conf create mode 100644 cross/mipsel.conf create mode 100644 cross/powerpc.conf diff --git a/cross/armel.conf b/cross/armel.conf new file mode 100644 index 0000000..d0c4c2e --- /dev/null +++ b/cross/armel.conf @@ -0,0 +1,11 @@ +[General] +include=/usr/share/multistrap/crosschroot.conf +omitrequired=false +configscript=config.sh +setupscript=setup.sh + +[Toolchains] +packages=g++-4.2-arm-linux-gnueabi linux-libc-dev-armel-cross +source=http://www.emdebian.org/debian +keyring=emdebian-archive-keyring +suite=stable diff --git a/crosschroot.conf b/cross/crosschroot.conf similarity index 85% rename from crosschroot.conf rename to cross/crosschroot.conf index 7d91a60..5f81603 100644 --- a/crosschroot.conf +++ b/cross/crosschroot.conf @@ -31,9 +31,3 @@ source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=stable -[Toolchains] -packages=g++-4.2-arm-linux-gnueabi linux-libc-dev-armel-cross -source=http://www.emdebian.org/debian -keyring=emdebian-archive-keyring -suite=stable - diff --git a/cross/mips.conf b/cross/mips.conf new file mode 100644 index 0000000..1f746eb --- /dev/null +++ b/cross/mips.conf @@ -0,0 +1,8 @@ +[General] +include=/usr/share/multistrap/crosschroot.conf + +[Toolchains] +packages=g++-4.2-mips-linux-gnu linux-libc-dev-mips-cross +source=http://www.emdebian.org/debian +keyring=emdebian-archive-keyring +suite=stable diff --git a/cross/mipsel.conf b/cross/mipsel.conf new file mode 100644 index 0000000..6251717 --- /dev/null +++ b/cross/mipsel.conf @@ -0,0 +1,8 @@ +[General] +include=/usr/share/multistrap/crosschroot.conf + +[Toolchains] +packages=g++-4.2-mipsel-linux-gnu linux-libc-dev-mipsel-cross +source=http://www.emdebian.org/debian +keyring=emdebian-archive-keyring +suite=stable diff --git a/cross/powerpc.conf b/cross/powerpc.conf new file mode 100644 index 0000000..0385fa5 --- /dev/null +++ b/cross/powerpc.conf @@ -0,0 +1,8 @@ +[General] +include=/usr/share/multistrap/crosschroot.conf + +[Toolchains] +packages=g++-4.2-powerpc-linux-gnu linux-libc-dev-powerpc-cross +source=http://www.emdebian.org/debian +keyring=emdebian-archive-keyring +suite=stable diff --git a/debian/changelog b/debian/changelog index 71668e1..66390fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ multistrap (2.1.1) experimental; urgency=low * Add --simulate mode for cascading configuration testing. * Split out the POD - not needed in the runtime script. + * Add cascading configuration to support standard Emdebian cross + architectures. - -- Neil Williams Sat, 17 Apr 2010 22:24:43 +0100 + -- Neil Williams Sat, 17 Apr 2010 22:25:45 +0100 multistrap (2.1.0) experimental; urgency=low diff --git a/debian/control b/debian/control index 7f4e8e1..9989cc9 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Wookey Build-Depends: cdbs, debhelper (>= 5), po4a (>= 0.37.1), po-debconf Build-Depends-Indep: devscripts, gnupg, intltool Standards-Version: 3.8.4 -Homepage: http://www.emdebian.org/ +Homepage: http://www.emdebian.org/multistrap Vcs-Browser: http://buildd.emdebian.org/svn/browser/current/host/trunk/emdebian-rootfs/trunk/ Vcs-Svn: http://buildd.emdebian.org/repos/current/host/trunk/emdebian-rootfs/trunk/ @@ -23,8 +23,8 @@ Description: multiple repository bootstrap based on apt using apt to handle all dependency issues and conflicts. . Multistrap includes support for foreign architecture multistraps - that need only minimal configuration on the final device. Also - supports cleaning up the generated bootstrap filesystem to + that need only minimal configuration on the final device. Also + supports cleaning up the generated bootstrap filesystem to remove downloaded packages and hooks to modify the files in the bootstrap filesystem after the packages have been unpacked but before being configured. @@ -37,6 +37,3 @@ Description: multiple repository bootstrap based on apt Also included is the previous emdebian-rootfs support for customisation of package selection and of files created within the root filesystem. - . - Root filesystems created with multistrap need minimal - configuration on the embedded device before the first boot.