diff --git a/misc/config-examples/bbs-arm-qemu/NOTES b/misc/config-examples/bbs-arm-qemu/NOTES index b7f4c5063..f1ab5c122 100644 --- a/misc/config-examples/bbs-arm-qemu/NOTES +++ b/misc/config-examples/bbs-arm-qemu/NOTES @@ -33,7 +33,10 @@ qemu-system-arm -kernel build/bbs-arm-qemu-TRUNK-arm-EL-arm926ejs-cross-generic- Hints And Known Bugs -------------------- -- To use the cdrom image in qemu, create it after the build has finished: +- The kernel and initrd image can also be found in the boot/ directory of the + CD-ROM image. + +- To use the CD-ROM image in qemu, create it after the build has finished: ./scripts/Create-ISO bbs-arm-qemu bbs-arm-qemu - To use a hard disk in qemu, create it with e.g.: @@ -48,5 +51,3 @@ Hints And Known Bugs - For an unknown reason, find is broken in this build (but works in e.g. sparc and x86_64 cross-builds). Use oldfind instead. -- Package installation with stone does not work yet; use mine directly to - install packages. diff --git a/misc/config-examples/bbs-arm-qemu/config b/misc/config-examples/bbs-arm-qemu/config index 5c739e0fa..a1f9930a7 100644 --- a/misc/config-examples/bbs-arm-qemu/config +++ b/misc/config-examples/bbs-arm-qemu/config @@ -5,9 +5,10 @@ export ROCKCFG_ABORT_ON_ERROR='1' export ROCKCFG_ALWAYS_CLEAN='0' export ROCKCFG_ARCH='arm' +export ROCKCFG_ARM_ABI='generic' export ROCKCFG_ARM_ENDIANESS='EL' -export ROCKCFG_ARM_OPT='arm926ejs' -export ROCKCFG_ARM_OPT_ARCH='armv5' +export ROCKCFG_ARM_OPT='arm926ej-s' +export ROCKCFG_ARM_OPT_ARCH='generic' export ROCKCFG_AUTOPCH='0' export ROCKCFG_CONFIGURE_OPTS='' export ROCKCFG_CREATE_CACHE='1' @@ -34,7 +35,7 @@ export ROCKCFG_DO_REBUILD_STAGE='0' export ROCKCFG_EXPERT='1' export ROCKCFG_FLIST='flwrapper' export ROCKCFG_HTTP='0' -export ROCKCFG_ID='bbs-arm-qemu-TRUNK-arm-EL-arm926ejs-cross-generic-expert' +export ROCKCFG_ID='bbs-arm-qemu-TRUNK-arm-EL-arm926ej-s-cross-generic-expert' export ROCKCFG_IDCKSUM='0' export ROCKCFG_JAILING='0' export ROCKCFG_LIMITCXX='0' @@ -69,7 +70,13 @@ export ROCKCFG_PKG_CROSSTOOL_x86_64='0' export ROCKCFG_PKG_GAMES_BINDIR='usr/games' export ROCKCFG_PKG_GAMES_DATADIR='usr/share' export ROCKCFG_PKG_GAMES_SCOREDIR='var/games/scores' +export ROCKCFG_PKG_GCC42_ADA='0' +export ROCKCFG_PKG_GCC42_CPP='1' +export ROCKCFG_PKG_GCC42_FORTRAN='1' +export ROCKCFG_PKG_GCC42_JAVA='0' export ROCKCFG_PKG_GCC42_NO_JAVA='1' +export ROCKCFG_PKG_GCC42_OBJC='1' +export ROCKCFG_PKG_GCC42_OBJCPP='1' export ROCKCFG_PKG_GCC42_PROFILED='0' export ROCKCFG_PKG_GCC_GCC2='0' export ROCKCFG_PKG_GCC_GCC32='0' @@ -110,7 +117,7 @@ export ROCKCFG_PSEUDONATIVE='0' export ROCKCFG_REALTIME='0' export ROCKCFG_RETRY_BROKEN='0' export ROCKCFG_SENDMAIL='0' -export ROCKCFG_SHORTID='TRUNK-arm-EL-arm926ejs-cross-generic-expert' +export ROCKCFG_SHORTID='TRUNK-arm-EL-arm926ej-s-cross-generic-expert' export ROCKCFG_SPLIT_DEV='1' export ROCKCFG_SPLIT_DOC='1' export ROCKCFG_SRC_TMPFS='0' diff --git a/misc/config-examples/bbs-arm-qemu/config_usr b/misc/config-examples/bbs-arm-qemu/config_usr index be3829057..0db96eebd 100644 --- a/misc/config-examples/bbs-arm-qemu/config_usr +++ b/misc/config-examples/bbs-arm-qemu/config_usr @@ -4,8 +4,8 @@ ROCKCFGUSR_ABORT_ON_ERROR='1' ROCKCFGUSR_ARCH='arm' ROCKCFGUSR_ARM_ENDIANESS='EL' -ROCKCFGUSR_ARM_OPT='arm926ejs' -ROCKCFGUSR_ARM_OPT_ARCH='armv5' +ROCKCFGUSR_ARM_OPT='arm926ej-s' +ROCKCFGUSR_ARM_OPT_ARCH='generic' ROCKCFGUSR_CROSSBUILD='1' ROCKCFGUSR_DO_REBUILD_STAGE='0' ROCKCFGUSR_EXPERT='1' diff --git a/misc/config-examples/bbs-arm-qemu/pkgsel b/misc/config-examples/bbs-arm-qemu/pkgsel index 101fcef76..18ca6e6ea 100644 --- a/misc/config-examples/bbs-arm-qemu/pkgsel +++ b/misc/config-examples/bbs-arm-qemu/pkgsel @@ -1 +1,5 @@ X target-finish +O python +O postfix +X dbus +O modutils diff --git a/misc/config-examples/bbs-x86_64-qemu/NOTES b/misc/config-examples/bbs-x86_64-qemu/NOTES index ae8a77348..647e1fad6 100644 --- a/misc/config-examples/bbs-x86_64-qemu/NOTES +++ b/misc/config-examples/bbs-x86_64-qemu/NOTES @@ -31,5 +31,3 @@ Hints And Known Bugs - To use a hard disk in qemu, create it with e.g.: qemu-img create /srv/qemu.hda 2048M -- Package installation with stone does not work yet; use mine directly to - install packages. diff --git a/misc/config-examples/bbs-x86_64-qemu/config b/misc/config-examples/bbs-x86_64-qemu/config index 30b3fd578..84072ed08 100644 --- a/misc/config-examples/bbs-x86_64-qemu/config +++ b/misc/config-examples/bbs-x86_64-qemu/config @@ -42,7 +42,7 @@ export ROCKCFG_KERNEL_UMLPATCH='0' export ROCKCFG_LIMITCXX='0' export ROCKCFG_LINGUAS='de es fr it ru' export ROCKCFG_LVM_MANPAGES='lvm2' -export ROCKCFG_MULTILIB='0' +export ROCKCFG_MULTILIB='1' export ROCKCFG_NOBROKENDEPS='0' export ROCKCFG_OPT='size' export ROCKCFG_OUTPUT_HTML='0' @@ -156,7 +156,13 @@ export ROCKCFG_PKG_FREEDICT_TUR_ENG='1' export ROCKCFG_PKG_GAMES_BINDIR='usr/games' export ROCKCFG_PKG_GAMES_DATADIR='usr/share' export ROCKCFG_PKG_GAMES_SCOREDIR='var/games/scores' +export ROCKCFG_PKG_GCC42_ADA='0' +export ROCKCFG_PKG_GCC42_CPP='1' +export ROCKCFG_PKG_GCC42_FORTRAN='1' +export ROCKCFG_PKG_GCC42_JAVA='0' export ROCKCFG_PKG_GCC42_NO_JAVA='1' +export ROCKCFG_PKG_GCC42_OBJC='1' +export ROCKCFG_PKG_GCC42_OBJCPP='1' export ROCKCFG_PKG_GCC42_PROFILED='0' export ROCKCFG_PKG_GCC_STACKPRO='0' export ROCKCFG_PKG_GLIBC23_LINUXTHREADS='1' diff --git a/misc/config-examples/bbs-x86_64-qemu/config_usr b/misc/config-examples/bbs-x86_64-qemu/config_usr index 21a3e8de5..09037a064 100644 --- a/misc/config-examples/bbs-x86_64-qemu/config_usr +++ b/misc/config-examples/bbs-x86_64-qemu/config_usr @@ -6,6 +6,7 @@ ROCKCFGUSR_ARCH='x86' ROCKCFGUSR_CROSSBUILD='1' ROCKCFGUSR_DO_REBUILD_STAGE='0' ROCKCFGUSR_EXPERT='1' +ROCKCFGUSR_MULTILIB='1' ROCKCFGUSR_PKGSEL='1' ROCKCFGUSR_PKGSEL_TPL='bbs' ROCKCFGUSR_PKG_APACHE_BDB='bdb44' diff --git a/misc/config-examples/bbs-x86_64-qemu/pkgsel b/misc/config-examples/bbs-x86_64-qemu/pkgsel index f0a1ac621..442bd85af 100644 --- a/misc/config-examples/bbs-x86_64-qemu/pkgsel +++ b/misc/config-examples/bbs-x86_64-qemu/pkgsel @@ -1,2 +1,3 @@ X target-finish - +O modutils +O grub