Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updates to jmd builds

  • Loading branch information...
commit 249c4fcf8b1f4d99ff1a76e325d25424bce4d145 1 parent 4f5d355
@drescherjm authored
View
55 etc/builds/jmd/build.conf
@@ -4,6 +4,7 @@
#[collect ./stage4-desktop-multilib.conf]
#[collect ./stage4.conf]
[collect ./stage4-gnome.conf]
+[collect ./stage5-gnome.conf]
[section local]
@@ -18,7 +19,7 @@ toolchain: 2009
[section portage]
stable:
-FEATURES: candy ccache
+FEATURES: candy ccache parallel-install
USE: bash-completion bzip2 caps urandom
MAKEOPTS: -j7
profile: default/linux/$[target/arch:zap]/10.0
@@ -30,10 +31,11 @@ branch: base
[section emerge]
-options: --quiet --usepkg --jobs 8 --keep-going=y
+options: --update --deep --quiet --usepkg --jobs 12 --keep-going=y --binpkg-respect-use=y
packages: [
app-admin/logrotate
app-admin/syslog-ng
+ app-misc/screen
app-portage/autounmask
app-portage/eix
app-portage/elogv
@@ -47,6 +49,8 @@ packages: [
app-admin/sudo
net-fs/nfs-utils
net-fs/autofs
+ sys-apps/gptfdisk
+ sys-apps/moreutils
]
[section baselayout]
@@ -68,7 +72,7 @@ name: portage
path: rsync://jmd0/gentoo-portage
[section metro]
-options/stage: cache/package cache/compiler
+options/stage: cache/package cache/compiler cache/genkernel
target: gentoo
[section multi]
@@ -76,6 +80,49 @@ target: gentoo
snapshot: snapshot
#extras: openvz jmd/stage4 jmd/stage4-desktop
#extras: openvz
-extras: jmd/stage4-gnome jmd/stage4-kde
+extras: jmd/stage4-gnome jmd/stage5-gnome jmd/stage4-kde jmd/stage5-kde
[collect ./multi-targets/$[multi/mode:zap]]
+
+[section iso]
+binfile: /usr/share/syslinux/isolinux.bin
+hybrid: yes
+#memfile: yes
+memtest: /usr/share/syslinux/memdisk
+
+gpgkey:
+
+[section iso/files]
+isolinux.cfg: [
+prompt 1
+default $[target/build]
+
+label $[target/build]
+ kernel kernel
+ append root=/dev/ram0 looptype=squashfs loop=/image.squashfs cdroot
+ initrd initramfs
+]
+
+cdupdate.sh: [
+#!/bin/sh
+
+. /etc/initrd.defaults
+
+# The following fixes OpenRC issues
+(test -d $NEW_ROOT/libexec/rc/init.d || mkdir -p $NEW_ROOT/libexec/rc/init.d) \
+ || exit 1
+
+cp -ar $NEW_ROOT/mnt/livecd/libexec/rc $NEW_ROOT/libexec || exit 1
+]
+
+extra: /home/apple/metro/etc/builds/iso/build.conf
+services: hald dbus icecream
+
+[section genkernel]
+opts: [
+ --unionfs
+ --lvm
+ --dmraid
+ --luks
+ --firmware
+]
View
2  etc/builds/jmd/multi-targets/freshen
@@ -5,5 +5,5 @@
[section multi]
-targets: $[:snapshot] stage3-freshen $[:extras]
+targets: $[:snapshot] jmd/stage3-freshen $[:extras]
View
2  etc/builds/jmd/multi-targets/quick
@@ -5,4 +5,4 @@
[section multi]
-targets: $[:snapshot] stage3-quick $[:extras]
+targets: $[:snapshot] jmd/stage3-quick $[:extras]
View
2  etc/builds/jmd/stage4-gnome.conf
@@ -1,4 +1,4 @@
-[section jmd/stage4]
+[section jmd/stage4-gnome]
portage/USE:
View
42 etc/builds/jmd/stage5-gnome.conf
@@ -0,0 +1,42 @@
+[section jmd/stage5-gnome/iso]
+binfile: /usr/share/syslinux/isolinux.bin
+hybrid: yes
+#memfile: yes
+memtest: /usr/share/syslinux/memdisk
+
+gpgkey:
+
+[section jmd/stage5-gnome/files]
+isolinux.cfg: [
+prompt 1
+default $[target/build]
+
+label $[target/build]
+ kernel kernel
+ append root=/dev/ram0 looptype=squashfs loop=/image.squashfs cdroot
+ initrd initramfs
+]
+
+cdupdate.sh: [
+#!/bin/sh
+
+. /etc/initrd.defaults
+
+# The following fixes OpenRC issues
+(test -d $NEW_ROOT/libexec/rc/init.d || mkdir -p $NEW_ROOT/libexec/rc/init.d) \
+ || exit 1
+
+cp -ar $NEW_ROOT/mnt/livecd/libexec/rc $NEW_ROOT/libexec || exit 1
+]
+
+extra: /home/apple/metro/etc/builds/iso/build.conf
+services: hald dbus icecream
+
+[section jmd/stage5-gnome/genkernel]
+opts: [
+ --unionfs
+ --lvm
+ --dmraid
+ --luks
+ --firmware
+]
View
42 etc/builds/jmd/stage5-kde.conf
@@ -0,0 +1,42 @@
+[section jmd/stage5-kde/iso]
+binfile: /usr/share/syslinux/isolinux.bin
+hybrid: yes
+#memfile: yes
+memtest: /usr/share/syslinux/memdisk
+
+gpgkey:
+
+[section jmd/stage5-kde/files]
+isolinux.cfg: [
+prompt 1
+default $[target/build]
+
+label $[target/build]
+ kernel kernel
+ append root=/dev/ram0 looptype=squashfs loop=/image.squashfs cdroot
+ initrd initramfs
+]
+
+cdupdate.sh: [
+#!/bin/sh
+
+. /etc/initrd.defaults
+
+# The following fixes OpenRC issues
+(test -d $NEW_ROOT/libexec/rc/init.d || mkdir -p $NEW_ROOT/libexec/rc/init.d) \
+ || exit 1
+
+cp -ar $NEW_ROOT/mnt/livecd/libexec/rc $NEW_ROOT/libexec || exit 1
+]
+
+extra: /home/apple/metro/etc/builds/iso/build.conf
+services: hald dbus icecream
+
+[section jmd/stage5-kde/genkernel]
+opts: [
+ --unionfs
+ --lvm
+ --dmraid
+ --luks
+ --firmware
+]
View
1  etc/metro.conf
@@ -21,6 +21,7 @@ git: $[]/cloned-repositories
package: $[path/cache/build]/package
compiler: $[path/cache/build]/compiler
probe: $[path/cache/build]/probe
+genkernel: $[path/cache/build]/genkernel
# Mirror Paths - where to find required files and where to put created files
View
3  modules/targets.py
@@ -166,7 +166,8 @@ def __init__(self,settings):
for key, name, dest in [
[ "path/cache/compiler", "cache/compiler", "/var/tmp/cache/compiler" ] ,
[ "path/cache/package", "cache/package", "/var/tmp/cache/package" ] ,
- [ "path/cache/probe", "probe", "/var/tmp/cache/probe" ] ]:
+ [ "path/cache/probe", "probe", "/var/tmp/cache/probe" ] ,
+ [ "path/cache/genkernel", "cache/genkernel","/var/tmp/cache/genkernel"] ]:
if self.settings.has_key(skey) and name in self.settings[skey].split():
if not self.settings.has_key(key):
raise MetroError, "Required setting %s not found (for %s option support)" % ( key, name )
View
2  targets/gentoo/jmd/stage/steps.spec
@@ -26,7 +26,7 @@ setup: [
gcc-config 1
source /etc/profile
export MAKEOPTS="$[portage/MAKEOPTS:zap]"
-export FEATURES="$[portage/FEATURES] safetydance"
+export FEATURES="$[portage/FEATURES]"
export EMERGE_WARNING_DELAY=0
export CLEAN_DELAY=0
export EBEEP_IGNORE=0
View
11 targets/gentoo/jmd/stage1.spec
@@ -128,6 +128,8 @@ echo
# It's important to merge baselayout first so it can set perms on key dirs
emerge $eopts --nodeps baselayout || exit 1
+emerge $eopts --nodeps "app-admin/logrotate"
+
echo "/etc/make.conf contains:"
cat /etc/make.conf
echo
@@ -138,8 +140,13 @@ echo "Portage version"
emerge --version
echo
-emerge $eopts -p -v --noreplace --oneshot ${buildpkgs} || exit 3
-emerge $eopts --noreplace --oneshot ${buildpkgs} || exit 1
+
+#emerge $eopts -p -v --noreplace --oneshot ${buildpkgs} || exit 3
+#emerge $eopts --noreplace --oneshot ${buildpkgs} || exit 1
+
+
+emerge $eopts -p -v --noreplace --oneshot ${buildpkgs}
+emerge $eopts --noreplace --oneshot ${buildpkgs}
# create minimal set of device nodes
install -d ${ROOT}/{proc,sys,dev/pts,dev/shm}
View
58 targets/gentoo/jmd/steps-stage4-desktop-multilib.spec
@@ -1,58 +0,0 @@
-[section steps/jmd]
-
-stage4-desktop-multilib: [
-
-cp /usr/share/zoneinfo/$[jmd/stage4-desktop-multilib/timezone] /etc/localtime
-
-eselect profile set default/linux/amd64/10.0/desktop
-
-layman -S
-layman -a multilib
-echo "source /var/lib/layman/make.conf" >> /etc/make.conf
-
-echo 'SETARCH_ARCH_x86="i686"' >> /etc/make.conf
-
-if [ "$[jmd/stage4-desktop-multilib/portage/USE?]" = "yes" ]
-then
- echo "Addding configuration USE flags"
- euse -E "$[jmd/stage4-desktop-multilib/portage/USE:lax]"
-fi
-
-# openssl improperly links if it is already installed
-emerge -C openssl
-
-emerge abi-wrapper
-# The following is to avoid circular references with lib32
-USE="-ldap -gpm" emerge ncurses
-USE="-acl" emerge gettext
-
-USE="-ldap" emerge dev-libs/cyrus-sasl
-emerge openldap
-
-if [ "$[jmd/stage4-desktop-multilib/portage/files/package.use?]" = "yes" ]
-then
-cat >> /etc/portage/package.use << "EOF"
-$[[jmd/stage4-desktop-multilib/portage/files/package.use:lax]]
-EOF
-fi
-if [ "$[jmd/stage4-desktop-multilib/portage/files/package.keywords?]" = "yes" ]
-then
-cat >> /etc/portage/package.keywords << "EOF"
-$[[jmd/stage4-desktop-multilib/portage/files/package.keywords:lax]]
-EOF
-fi
-if [ "$[jmd/stage4-desktop-multilib/portage/files/package.unmask?]" = "yes" ]
-then
-cat >> /etc/portage/package.unmask << "EOF"
-$[[jmd/stage4-desktop-multilib/portage/files/package.unmask:lax]]
-EOF
-fi
-if [ "$[jmd/stage4-desktop-multilib/portage/files/package.mask?]" = "yes" ]
-then
-cat >> /etc/portage/package.mask << "EOF"
-$[[jmd/stage4-desktop-multilib/portage/files/package.mask:lax]]
-EOF
-fi
-
-emerge $eopts $[jmd/stage4-desktop-multilib/packages] || exit 1
-]
View
2  targets/gentoo/jmd/steps/steps-stage4-gnome.spec
@@ -5,7 +5,7 @@ stage4-gnome: [
cd /usr/local/gentoo-keywords
git checkout gnome
- options = ${eopts} --newuse --deep --keep-going=y
+ options="${eopts} --newuse --deep --keep-going=y --autounmask-write"
emerge ${options} system || emerge ${options} system || emerge ${options} system || emerge -uDvNB system
emerge ${options} world || emerge ${options} world || emerge ${options} world || emerge -uDvNB world
View
2  targets/gentoo/jmd/steps/steps-stage4-kde.spec
@@ -19,7 +19,7 @@ stage4-kde: [
ln -s /usr/local/gentoo-keywords/sets
popd
- options = ${eopts} --newuse --deep --keep-going=y
+ options="${eopts} --newuse --deep --keep-going=y --autounmask-write"
emerge ${options} system || emerge ${options} system || emerge ${options} system || emerge ${options} system
Please sign in to comment.
Something went wrong with that request. Please try again.