diff --git a/target/livecd/config.in b/target/livecd/config.in index 3062052e6..abdc33d13 100644 --- a/target/livecd/config.in +++ b/target/livecd/config.in @@ -21,21 +21,13 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- - -#. target/livecd/default.pkgsel - ROCKCFGSET_CREATE_TARBZ2=1 ROCKCFGSET_CREATE_GEM=0 -ROCKCFGSET_PKGFILE_VER=0 - -ROCKCFGSET_PKG_BASH_PROGCOMP=0 +ROCKCFGSET_PKGFILE_VER=1 ROCKCFGSET_DO_REBUILD_STAGE=0 -ROCKCFGSET_CREATE_DOCS=0 -ROCKCFGSET_OPTSIZE=1 -ROCKCFGSET_LIMITCXX=0 -ROCKCFGSET_PKG_LINUX_USE26MODTOOLS=1 +ROCKCFGSET_PKG_INITRAMFS_CONFIG='initramfs-livecd' # default package selection for this target... # begin the sed string @@ -53,19 +45,44 @@ pkgdisable gcc34 pkgdisable gcc40 pkgdisable gcc41 +pkgdisable ncompress +pkgdisable xphelloworld +pkgdisable xsm +pkgdisable xpdf + # pkgenable pseudonative-daemon pkgenable tcp_wrappers pkgenable portmap -# pkgenable pcmcia-cs -# pkgenable hotplug pkgenable udev pkgenable disktype - +# +pkgenable dbus +pkgenable dbus-glib +pkgenable dbus-qt3 +pkgenable hal + pkgenable hal-info + pkgenable usbutils +pkgenable grml-x + pkgenable hwinfo +pkgenable zisofs-tools +# pkgenable fuse pkgenable aufs pkgenable rockinitramfs pkgenable cpio +# +pkgenable autoconf213 +pkgenable pycairo +pkgenable pygtk +pkgenable pygobject +pkgenable gnupg2 +pkgenable libgpg-error +pkgenable libgcrypt +pkgenable libksba +pkgenable libassuan +pkgenable libpth +# target-finish packages pkgenable initramfs pkgenable 2nd-stage-livecd pkgenable bootloader diff --git a/target/livecd/kernel.conf b/target/livecd/kernel.conf index dc4cb4ae2..9f6e152cd 100644 --- a/target/livecd/kernel.conf +++ b/target/livecd/kernel.conf @@ -21,75 +21,12 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -# boot, damn it! -CONFIG_X86_GENERIC=y - -# FireWire support -CONFIG_IEEE1394=y -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y -CONFIG_IEEE1394_OHCI1394=y -CONFIG_IEEE1394_SBP2=y - -#enough space for a few modules -CONFIG_BLK_DEV_RAM_SIZE=8192 -# enable squashfs -CONFIG_SQUASHFS=y - # the useful magic rq CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y -# this is mandatory -CONFIG_BLK_DEV_IDECD=y - -# Console drivers -CONFIG_VGA_CONSOLE=y -CONFIG_VIDEO_SELECT=y -CONFIG_FB=y -CONFIG_FB_VESA=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_CLUT224=y - -#eek! this ovverides all others! evil! -CONFIG_FB_VGA16=n - -# agp already needed for some vga cards -CONFIG_AGP=y -CONFIG_AGP_INTEL=y -CONFIG_AGP_I810=y -CONFIG_AGP_VIA=y -CONFIG_AGP_AMD=y -CONFIG_AGP_AMD_K8=y -CONFIG_AGP_SIS=y -CONFIG_AGP_ALI=y -CONFIG_AGP_SWORKS=y -CONFIG_AGP_NVIDIA=y -CONFIG_AGP_ATI=y - -# drm -CONFIG_DRM=m -CONFIG_DRM_NEW=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_GAMMA=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -CONFIG_DRM_I810=m -CONFIG_DRM_I810_XFREE_41=m -CONFIG_DRM_I830=m -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m - -# SCSI support -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_DEV_SR=y -CONFIG_CHR_DEV_SG=y -CONFIG_SCSI_PROC_FS=y - -# no MD -CONFIG_MD=n +# Disable framebuffer support to avoid conflicts with xorg drivers +CONFIG_FB=n # no oss! CONFIG_SOUND_PRIME=n -CONFIG_DMASOUND_PMAC=n