From 7480318d740719cdf9ecc700f4d9781a765600f9 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Tue, 26 Aug 2003 19:01:05 +0000 Subject: [PATCH] Clifford Wolf: - Added packages cpuid and syslinux - Added framework for "package preselection templates" - Obsoleted / removed minimal target git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1197 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-CLIFFORD | 5 ++ package/x86/cpuid/cpuid.conf | 4 + package/x86/cpuid/cpuid.desc | 43 ++++++++++ package/x86/syslinux/syslinux.conf | 4 + package/x86/syslinux/syslinux.desc | 45 ++++++++++ target/minimal/build.sh | 3 - target/minimal/minimal.txt | 8 -- target/minimal/preconfig.in | 24 ------ .../{minimal/config.in => server/kernel.conf} | 83 ++++++++++++------- 9 files changed, 152 insertions(+), 67 deletions(-) create mode 100644 package/x86/cpuid/cpuid.conf create mode 100644 package/x86/cpuid/cpuid.desc create mode 100644 package/x86/syslinux/syslinux.conf create mode 100644 package/x86/syslinux/syslinux.desc delete mode 100644 target/minimal/build.sh delete mode 100644 target/minimal/minimal.txt delete mode 100644 target/minimal/preconfig.in rename target/{minimal/config.in => server/kernel.conf} (50%) diff --git a/Documentation/Developers/CHANGELOG-CLIFFORD b/Documentation/Developers/CHANGELOG-CLIFFORD index 81a1dc12c..1339136e1 100644 --- a/Documentation/Developers/CHANGELOG-CLIFFORD +++ b/Documentation/Developers/CHANGELOG-CLIFFORD @@ -1,4 +1,9 @@ +*) 2003-08-26 (2.0.0-camp - 2.0.0-rc1) + + - Added packages cpuid and syslinux + - Added framework for "package preselection templates" + *) 2003-08-20 (2.0.0-camp - 2.0.0-rc1) - new unchroot output plugin adaptions and a html output plugin diff --git a/package/x86/cpuid/cpuid.conf b/package/x86/cpuid/cpuid.conf new file mode 100644 index 000000000..36aed9774 --- /dev/null +++ b/package/x86/cpuid/cpuid.conf @@ -0,0 +1,4 @@ + +makeinstopt="" +postmake="cp -v cpuid $bindir/cpuid" + diff --git a/package/x86/cpuid/cpuid.desc b/package/x86/cpuid/cpuid.desc new file mode 100644 index 000000000..7206e68c3 --- /dev/null +++ b/package/x86/cpuid/cpuid.desc @@ -0,0 +1,43 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x86/cpuid/cpuid.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] report x86 CPU details + +[T] cpuid is a user-space application that prints out various informations +[T] about the CPU in the machine. If you ever wanted to know what all the +[T] flags in /proc/cpuinfo do mean: here comes the tool that can give you +[T] the answer. + +[A] Phil Karn +[M] Clifford Wolf + +[C] base/tool +[R] + x86 + +[L] GPL +[S] Stable +[V] 3.3 +[P] X -----5---9 127.300 + +[D] 0 cpuid-3.3.tar.gz http://www.ka9q.net/code/cpuid/ + diff --git a/package/x86/syslinux/syslinux.conf b/package/x86/syslinux/syslinux.conf new file mode 100644 index 000000000..0bf1d9987 --- /dev/null +++ b/package/x86/syslinux/syslinux.conf @@ -0,0 +1,4 @@ + +# just run 'make install' +makeopt="" + diff --git a/package/x86/syslinux/syslinux.desc b/package/x86/syslinux/syslinux.desc new file mode 100644 index 000000000..bc60a625e --- /dev/null +++ b/package/x86/syslinux/syslinux.desc @@ -0,0 +1,45 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/x86/memtest86/memtest86.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] Linux bootloader collection + +[T] The SYSLINUX project covers lightweight linux bootloaders for floppy +[T] media (syslinux), network booting (pxelinux) and bootable el-torito +[T] cd-roms (isolinux). + +[U] http://syslinux.zytor.com/ + +[A] H. Peter Anvin +[M] Clifford Wolf + +[C] base/tool +[F] DIETLIBC +[R] + x86 + +[L] GPL +[S] Stable +[V] 2.05 +[P] X -----5---9 126.300 + +[D] 0 syslinux-2.05.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/ + diff --git a/target/minimal/build.sh b/target/minimal/build.sh deleted file mode 100644 index bf0b6792a..000000000 --- a/target/minimal/build.sh +++ /dev/null @@ -1,3 +0,0 @@ - -. target/generic/build.sh - diff --git a/target/minimal/minimal.txt b/target/minimal/minimal.txt deleted file mode 100644 index 811b68202..000000000 --- a/target/minimal/minimal.txt +++ /dev/null @@ -1,8 +0,0 @@ - -This is the Minimal ROCK Linux system, intended a base for other small targets -to be created, or to be used as the as the most basic system to build ROCK -Linux. - -Created and maintained by: - Miguel A. Bolanos - diff --git a/target/minimal/preconfig.in b/target/minimal/preconfig.in deleted file mode 100644 index 7fbba0f3f..000000000 --- a/target/minimal/preconfig.in +++ /dev/null @@ -1,24 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/target/minimal/preconfig.in -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# 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; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -CFGTEMP_TARGETLIST="$CFGTEMP_TARGETLIST minimal Minimal_ROCK_Linux" - diff --git a/target/minimal/config.in b/target/server/kernel.conf similarity index 50% rename from target/minimal/config.in rename to target/server/kernel.conf index 3f8ebda19..49ed838c8 100644 --- a/target/minimal/config.in +++ b/target/server/kernel.conf @@ -5,7 +5,7 @@ # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # -# ROCK Linux: rock-src/target/minimal/config.in +# ROCK Linux: rock-src/target/server/config.in # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf # # This program is free software; you can redistribute it and/or modify @@ -20,35 +20,54 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -pkgfilter sed ' - -# Disable packages -/ a2ps / { s/^X /O /p; d; }; -/ alsa / { s/^X /O /p; d; }; -/ alsa-driver / { s/^X /O /p; d; }; -/ biff+comsat / { s/^X /O /p; d; }; -/ bind / { s/^X /O /p; d; }; -/ howtos / { s/^X /O /p; d; }; -/ ifhp / { s/^X /O /p; d; }; -/ ircii / { s/^X /O /p; d; }; -/ irda-utils / { s/^X /O /p; d; }; -/ joe / { s/^X /O /p; d; }; -/ lprng / { s/^X /O /p; d; }; -/ mutt / { s/^X /O /p; d; }; -/ net-snmp / { s/^X /O /p; d; }; -/ pine / { s/^X /O /p; d; }; -/ procmail / { s/^X /O /p; d; }; -/ sendmail / { s/^X /O /p; d; }; -/ wu-ftpd / { s/^X /O /p; d; }; - -# Select repositories -/ base / { p; d; }; -/ alpha / { p; d; }; -/ mips / { p; d; }; -/ powerpc / { p; d; }; -/ sparc / { p; d; }; -/ x86 / { p; d; }; - -# Disable the rest -/.*/ { s/^X /O /p; d; };' +# the most common desktop system +CONFIG_SMP=n +CONFIG_X86_UP_APIC=y +CONFIG_X86_UP_IOAPIC=y + +CONFIG_MODVERSIONS=y + +# more recent boxes need ACPI ... +CONFIG_ACPI=y +CONFIG_ACPI_BUSMGR=y +CONFIG_ACPI_SYS=y +CONFIG_ACPI_CPU=y +CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_AC=y +CONFIG_ACPI_EC=y +CONFIG_ACPI_CMBATT=y +CONFIG_ACPI_THERMAL=y +CONFIG_APM=y + +# some embedded or server stuff +CONFIG_MTD=n +CONFIG_PHONE=n +CONFIG_FUSION=n +CONFIG_I2O=n +CONFIG_HAMRADIO=n + + +# make USB only system happy + +CONFIG_INPUT=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_KEYBDEV=y +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_JOYSTICK=y +CONFIG_INPUT_TOUCHSCREEN=m +CONFIG_INPUT_MISC=y + +# improtant USB support +CONFIG_USB=y +CONFIG_USB_DEVICEFS=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_UHCI=y +CONFIG_USB_OHCI=y +CONFIG_USB_HID=y +CONFIG_USB_HIDINPUT=y +CONFIG_USB_HIDDEV=y + +# the usefull magic rq +CONFIG_DEBUG_KERNEL=y +CONFIG_MAGIC_SYSRQ=y