From 00b0094640db9e2695cbcde4f7f9edd887a3d24c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1briel?= Date: Fri, 4 Mar 2016 16:55:50 +0000 Subject: [PATCH] toolchain: reworked package selection to be modular --- target/toolchain/pkgsel | 57 ------------------- target/toolchain/pkgsel.d/00-wipe.all | 17 ++++++ target/toolchain/pkgsel.d/opensde-boot.all | 24 ++++++++ target/toolchain/pkgsel.d/opensde-core.all | 42 ++++++++++++++ .../opensde-development-toolchain.all | 42 ++++++++++++++ target/toolchain/pkgsel.d/qemu.ask | 18 ++++++ target/toolchain/pkgsel.d/toolchain-core.all | 39 +++++++++++++ target/toolchain/pkgsel.in | 21 +++++++ 8 files changed, 203 insertions(+), 57 deletions(-) delete mode 100644 target/toolchain/pkgsel create mode 100644 target/toolchain/pkgsel.d/00-wipe.all create mode 100644 target/toolchain/pkgsel.d/opensde-boot.all create mode 100644 target/toolchain/pkgsel.d/opensde-core.all create mode 100644 target/toolchain/pkgsel.d/opensde-development-toolchain.all create mode 100644 target/toolchain/pkgsel.d/qemu.ask create mode 100644 target/toolchain/pkgsel.d/toolchain-core.all create mode 100644 target/toolchain/pkgsel.in diff --git a/target/toolchain/pkgsel b/target/toolchain/pkgsel deleted file mode 100644 index 860f4d3..0000000 --- a/target/toolchain/pkgsel +++ /dev/null @@ -1,57 +0,0 @@ -O * -X fhs -X sysfiles - -X linux-header -X glibc - -#Toolchain -#this is an extended toolchain -#containing all needed to build -#OpenSDE packages andf boot a builder -X autoconf -X automake -X bash -X bc -X binutils -X bison -X bzip2 -X ccache -X cloog -X coreutils -X diffutils -X file -X findutils -X flex -X gawk -X gcc -X gettext -X gmp -X grep -X groff -X gzip -X isl -X kmod -X libmpc -X libtool -X m4 -X make -X mpfr -X openssl -X patch -X perl -X pkgconfig -X sed -X sudo -X tar -X texinfo -X time -X util-linux -X zlib - -#Various stuff -X runit - -#Boot -X linux - diff --git a/target/toolchain/pkgsel.d/00-wipe.all b/target/toolchain/pkgsel.d/00-wipe.all new file mode 100644 index 0000000..30e24c2 --- /dev/null +++ b/target/toolchain/pkgsel.d/00-wipe.all @@ -0,0 +1,17 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: target/toolchain/pkgsel.d/00-wipe.all +# Copyright (C) 2016 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +# wipe everything out +O * + diff --git a/target/toolchain/pkgsel.d/opensde-boot.all b/target/toolchain/pkgsel.d/opensde-boot.all new file mode 100644 index 0000000..5168ebb --- /dev/null +++ b/target/toolchain/pkgsel.d/opensde-boot.all @@ -0,0 +1,24 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: target/toolchain/pkgsel.d/opensde-boot.all +# Copyright (C) 2016 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +# linux kernel +X linux +X kmod +X bc + +# x86/x86-64 boot loader +X syslinux + +# needed by syslinux +X nasm diff --git a/target/toolchain/pkgsel.d/opensde-core.all b/target/toolchain/pkgsel.d/opensde-core.all new file mode 100644 index 0000000..d1f931b --- /dev/null +++ b/target/toolchain/pkgsel.d/opensde-core.all @@ -0,0 +1,42 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: target/toolchain/pkgsel.d/opensde-core.all +# Copyright (C) 2016 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +# structure +X fhs + +# files +X sysfiles +X iana-etc + +# shell +X bash + +# commands +X coreutils +X util-linux +X grep +X sed +X gawk +X mktemp + +# not that basic, but needed by our framework to enter stage 2 +X file +X findutils +X time +X tar +X bzip2 + +# needed by util-linux +X e2fsprogs + diff --git a/target/toolchain/pkgsel.d/opensde-development-toolchain.all b/target/toolchain/pkgsel.d/opensde-development-toolchain.all new file mode 100644 index 0000000..e8428a8 --- /dev/null +++ b/target/toolchain/pkgsel.d/opensde-development-toolchain.all @@ -0,0 +1,42 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: target/toolchain/pkgsel.d/opensde-development-toolchain.all +# Copyright (C) 2016 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +X binutils +X bison +X flex +X patch +X make +X autoconf +X automake +X libtool +X gdb +X strace +X libunwind +X gettext +X git +X groff + +X pkgconfig + +X m4 +X diffutils + +X texinfo +X openssl +X perl +X sudo +X curl +X pcre +X python + diff --git a/target/toolchain/pkgsel.d/qemu.ask b/target/toolchain/pkgsel.d/qemu.ask new file mode 100644 index 0000000..943fa20 --- /dev/null +++ b/target/toolchain/pkgsel.d/qemu.ask @@ -0,0 +1,18 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: target/toolchain/pkgsel.d/qemu.ask +# Copyright (C) 2016 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +X qemu +X glib +X libffi + diff --git a/target/toolchain/pkgsel.d/toolchain-core.all b/target/toolchain/pkgsel.d/toolchain-core.all new file mode 100644 index 0000000..66e1372 --- /dev/null +++ b/target/toolchain/pkgsel.d/toolchain-core.all @@ -0,0 +1,39 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: target/toolchain/pkgsel.d/toolchain-core.all +# Copyright (C) 2016 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +X glibc +X zlib +X ncurses +X readline +X pam +X gcc + +# linux kernel headers +# +X linux-header + +# needed by glibc +X gzip + +# zoneinfo +X tzdata + +#needed by gcc +X cloog +X gmp +X isl +X mpfr +X libmpc +X unzip +X zip diff --git a/target/toolchain/pkgsel.in b/target/toolchain/pkgsel.in new file mode 100644 index 0000000..b0a2363 --- /dev/null +++ b/target/toolchain/pkgsel.in @@ -0,0 +1,21 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: target/toolchain/pkgsel.in +# Copyright (C) 2016 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + + +if [ -s "$cfgtmpdir/$target.pkgsel.in" ]; then + . "$cfgtmpdir/$target.pkgsel.in" + + pkgfilter awk -f $cfgtmpdir/$target.pkgsel.awk +fi +