From 25c49dab329bbb03320e76f70aa6d0ff309358de Mon Sep 17 00:00:00 2001 From: Lars Weiler Date: Sat, 9 Sep 2006 23:40:12 +0000 Subject: [PATCH] Now, this is the latest used spec svn path=/trunk/; revision=221 --- .../ppc/ppc32/installcd-2.6.17-apple.config | 20 +++++------ .../ppc/ppc32/installcd-2.6.17-pegasos.config | 33 +++++++++++-------- specs/2006.1/ppc/ppc32/distfiles.spec | 9 +++++ specs/2006.1/ppc/ppc32/g4/packages.spec | 9 +++++ .../ppc/ppc32/livecd-stage2-minimal.spec | 6 ++-- .../ppc/ppc32/livecd-stage2-universal.spec | 20 +++++------ specs/2006.1/ppc/ppc32/packages.spec | 9 +++++ 7 files changed, 65 insertions(+), 41 deletions(-) diff --git a/kconfig/2006.1/ppc/ppc32/installcd-2.6.17-apple.config b/kconfig/2006.1/ppc/ppc32/installcd-2.6.17-apple.config index 2f3f6762..9d86e982 100644 --- a/kconfig/2006.1/ppc/ppc32/installcd-2.6.17-apple.config +++ b/kconfig/2006.1/ppc/ppc32/installcd-2.6.17-apple.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17-gentoo-r3 -# Fri Aug 4 01:55:03 2006 +# Wed Aug 16 01:56:02 2006 # # CONFIG_PPC64 is not set CONFIG_PPC32=y @@ -18,7 +18,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_ARCH_MAY_HAVE_PC_FDC=y CONFIG_PPC_OF=y CONFIG_PPC_UDBG_16550=y -CONFIG_GENERIC_TBSYNC=y +# CONFIG_GENERIC_TBSYNC is not set # CONFIG_DEFAULT_UIMAGE is not set # @@ -38,14 +38,13 @@ CONFIG_PPC_FPU=y CONFIG_ALTIVEC=y CONFIG_PPC_STD_MMU=y CONFIG_PPC_STD_MMU_32=y -CONFIG_SMP=y -CONFIG_NR_CPUS=4 +# CONFIG_SMP is not set # # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_LOCK_KERNEL=y +CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 # @@ -61,7 +60,6 @@ CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -# CONFIG_CPUSETS is not set # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -90,7 +88,6 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y -CONFIG_STOP_MACHINE=y # # Block layer @@ -155,12 +152,9 @@ CONFIG_HZ=1000 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set -CONFIG_PREEMPT_BKL=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_MISC is not set -# CONFIG_HOTPLUG_CPU is not set # CONFIG_KEXEC is not set -# CONFIG_IRQ_ALL_CPUS is not set CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -176,6 +170,7 @@ CONFIG_CMDLINE="console=ttyS0,115200,8n1 console=tty0 init=/linuxrc looptype=squ CONFIG_PM=y CONFIG_PM_LEGACY=y # CONFIG_PM_DEBUG is not set +# CONFIG_SOFTWARE_SUSPEND is not set CONFIG_SECCOMP=y CONFIG_ISA_DMA_API=y @@ -719,6 +714,7 @@ CONFIG_WINBOND_840=m CONFIG_DM9102=m # CONFIG_ULI526X is not set CONFIG_PCMCIA_XIRCOM=m +# CONFIG_PCMCIA_XIRTULIP is not set # CONFIG_HP100 is not set CONFIG_NET_PCI=y CONFIG_PCNET32=m @@ -1489,7 +1485,7 @@ CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m +CONFIG_REISERFS_FS=y # CONFIG_REISERFS_CHECK is not set CONFIG_REISERFS_PROC_INFO=y CONFIG_REISERFS_FS_XATTR=y @@ -1685,7 +1681,7 @@ CONFIG_ZLIB_DEFLATE=m # CONFIG_PRINTK_TIME is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_KERNEL is not set -CONFIG_LOG_BUF_SHIFT=15 +CONFIG_LOG_BUF_SHIFT=14 # CONFIG_DEBUG_FS is not set CONFIG_BOOTX_TEXT=y # CONFIG_PPC_EARLY_DEBUG_LPAR is not set diff --git a/kconfig/2006.1/ppc/ppc32/installcd-2.6.17-pegasos.config b/kconfig/2006.1/ppc/ppc32/installcd-2.6.17-pegasos.config index 9ac3ae18..311b768d 100644 --- a/kconfig/2006.1/ppc/ppc32/installcd-2.6.17-pegasos.config +++ b/kconfig/2006.1/ppc/ppc32/installcd-2.6.17-pegasos.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17-gentoo-r3 -# Fri Aug 4 01:55:27 2006 +# Wed Aug 16 01:56:28 2006 # # CONFIG_PPC64 is not set CONFIG_PPC32=y @@ -54,7 +54,7 @@ CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_POSIX_MQUEUE is not set +CONFIG_POSIX_MQUEUE=y # CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y # CONFIG_AUDIT is not set @@ -154,8 +154,10 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_PROC_DEVICETREE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=/dev/ttyS1,115200,8n1 console=tty0 init=/linuxrc looptype=squashfs loop=/image.squashfs udev nodevfs cdroot root=/dev/ram" -# CONFIG_PM is not set +CONFIG_CMDLINE="console=/dev/ttyS0,115200 console=tty0 init=/linuxrc looptype=squashfs loop=/image.squashfs udev nodevfs cdroot root=/dev/ram" +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set # CONFIG_SOFTWARE_SUSPEND is not set CONFIG_SECCOMP=y CONFIG_ISA_DMA_API=y @@ -204,7 +206,7 @@ CONFIG_NET=y # # CONFIG_NETDEBUG is not set CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y +# CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y @@ -285,7 +287,7 @@ CONFIG_IPV6=m # # Generic Driver Options # -# CONFIG_STANDALONE is not set +CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=m @@ -563,8 +565,8 @@ CONFIG_IEEE1394_RAWIO=m # Network device support # CONFIG_NETDEVICES=y -CONFIG_DUMMY=m -CONFIG_BONDING=m +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set CONFIG_TUN=m @@ -703,9 +705,9 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m +# CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set -# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # @@ -749,19 +751,21 @@ CONFIG_HW_CONSOLE=y # Serial drivers # CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_CONSOLE is not set +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 # CONFIG_SERIAL_8250_EXTENDED is not set # # Non-8250 serial port support # CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y -# CONFIG_LEGACY_PTYS is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set # CONFIG_PPDEV is not set @@ -1015,6 +1019,7 @@ CONFIG_USB=m CONFIG_USB_DEVICEFS=y # CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG is not set # diff --git a/specs/2006.1/ppc/ppc32/distfiles.spec b/specs/2006.1/ppc/ppc32/distfiles.spec index d3711a15..52ec6f53 100644 --- a/specs/2006.1/ppc/ppc32/distfiles.spec +++ b/specs/2006.1/ppc/ppc32/distfiles.spec @@ -9,7 +9,16 @@ grp: src grp/use: -java + nptl + nptlonly dvdr + samba + xorg + dri + dbus + hal + bzip2 + qt3 grp/src/type: srcset grp/src/packages: diff --git a/specs/2006.1/ppc/ppc32/g4/packages.spec b/specs/2006.1/ppc/ppc32/g4/packages.spec index 8be853d3..2d338a61 100644 --- a/specs/2006.1/ppc/ppc32/g4/packages.spec +++ b/specs/2006.1/ppc/ppc32/g4/packages.spec @@ -9,7 +9,16 @@ grp: cd2 grp/use: -java + nptl + nptlonly dvdr + samba + xorg + dri + dbus + hal + bzip2 + qt3 grp/cd2/type: pkgset grp/cd2/packages: diff --git a/specs/2006.1/ppc/ppc32/livecd-stage2-minimal.spec b/specs/2006.1/ppc/ppc32/livecd-stage2-minimal.spec index 66ad0cb1..ca62c79f 100644 --- a/specs/2006.1/ppc/ppc32/livecd-stage2-minimal.spec +++ b/specs/2006.1/ppc/ppc32/livecd-stage2-minimal.spec @@ -16,7 +16,6 @@ livecd/type: gentoo-release-minimal #livecd/overlay: /root/livecd/overlays/ppc32-minimal -livecd/bootargs: dokeymap livecd/gk_mainargs: --lvm2 --evms2 boot/kernel: apple pegasos @@ -26,17 +25,16 @@ boot/kernel/apple/sources: sys-kernel/gentoo-sources boot/kernel/apple/use: pcmcia usb -X png truetype boot/kernel/apple/extraversion: apple boot/kernel/apple/packages: - pbbuttonsd cryptsetup-luks pcmcia-cs boot/kernel/pegasos/config: /root/livecd/kconfig/releases/2006.1/ppc/ppc32/installcd-2.6.17-pegasos.config -boot/kernel/pegasos/sources: =sys-kernel/gentoo-sources-2.6.15* +boot/kernel/pegasos/sources: sys-kernel/gentoo-sources boot/kernel/pegasos/use: usb -X png truetype boot/kernel/pegasos/extraversion: pegasos boot/kernel/pegasos/gk_kernargs: --no-initrdmodules --genzimage -livecd/rcadd: pbbuttonsd|default +livecd/bootargs: nokeymap livecd/unmerge: # acl diff --git a/specs/2006.1/ppc/ppc32/livecd-stage2-universal.spec b/specs/2006.1/ppc/ppc32/livecd-stage2-universal.spec index c63569b7..27085284 100644 --- a/specs/2006.1/ppc/ppc32/livecd-stage2-universal.spec +++ b/specs/2006.1/ppc/ppc32/livecd-stage2-universal.spec @@ -16,27 +16,25 @@ livecd/type: gentoo-release-universal livecd/overlay: /root/livecd/overlays/ppc32-universal -livecd/bootargs: dokeymap livecd/gk_mainargs: --lvm2 --evms2 -boot/kernel: ppc32 pegasos +boot/kernel: apple pegasos -boot/kernel/ppc32/config: /root/livecd/kconfig/releases/2006.1/ppc/ppc32/installcd-2.6.16-ppc32.config -boot/kernel/ppc32/sources: sys-kernel/gentoo-sources -boot/kernel/ppc32/use: pcmcia usb -X png truetype -boot/kernel/ppc32/extraversion: ppc32 -boot/kernel/ppc32/packages: - pbbuttonsd +boot/kernel/apple/config: /root/livecd/kconfig/releases/2006.1/ppc/ppc32/installcd-2.6.17-apple.config +boot/kernel/apple/sources: sys-kernel/gentoo-sources +boot/kernel/apple/use: pcmcia usb -X png truetype +boot/kernel/apple/extraversion: apple +boot/kernel/apple/packages: cryptsetup-luks pcmcia-cs -boot/kernel/pegasos/config: /root/livecd/kconfig/releases/2006.1/ppc/ppc32/installcd-2.6.15-pegasos.config -boot/kernel/pegasos/sources: =sys-kernel/gentoo-sources-2.6.15* +boot/kernel/pegasos/config: /root/livecd/kconfig/releases/2006.1/ppc/ppc32/installcd-2.6.17-pegasos.config +boot/kernel/pegasos/sources: sys-kernel/gentoo-sources boot/kernel/pegasos/use: usb -X png truetype boot/kernel/pegasos/extraversion: pegasos boot/kernel/pegasos/gk_kernargs: --no-initrdmodules --genzimage -livecd/rcadd: pbbuttonsd|default +livecd/bootargs: nokeymap livecd/unmerge: # acl diff --git a/specs/2006.1/ppc/ppc32/packages.spec b/specs/2006.1/ppc/ppc32/packages.spec index d11e230f..3f99ccc3 100644 --- a/specs/2006.1/ppc/ppc32/packages.spec +++ b/specs/2006.1/ppc/ppc32/packages.spec @@ -9,7 +9,16 @@ grp: cd2 grp/use: -java + nptl + nptlonly dvdr + samba + xorg + dri + dbus + hal + bzip2 + qt3 grp/cd2/type: pkgset grp/cd2/packages: