commit: 39ade8ec2d092c0db0c0f511cd2ab39077e24bd1 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Sat Sep 12 21:24:31 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Sep 12 21:24:31 2015 +0000 URL: https://gitweb.gentoo.org/proj/grs.git/commit/?id=39ade8ec
Do not make grs complete. Slim down packages. core/etc/fstab | 5 ++--- core/etc/grs/systems.conf | 3 --- core/etc/lilo.conf | 16 ---------------- core/var/lib/portage/{world.CYCLE.3 => world.CYCLE.1} | 17 ----------------- core/var/lib/portage/world.CYCLE.2 | 17 ++--------------- scripts/cycle.1.sh | 8 ++++---- scripts/cycle.2.sh | 5 +++-- 7 files changed, 11 insertions(+), 60 deletions(-) diff --git a/core/etc/fstab b/core/etc/fstab index 1c49327..16439f1 100644 --- a/core/etc/fstab +++ b/core/etc/fstab @@ -1,3 +1,2 @@ -/dev/sda1 /boot ext2 noauto,noatime 1 2 -/dev/sda3 / ext4 noatime 0 1 -/dev/sda2 none swap sw 0 0 +tmpfs / tmpfs size=6g,nr_inodes=2m 0 1 +shm /dev/shm tmpfs nodev,nosuid,noexec 0 0 diff --git a/core/etc/grs/systems.conf b/core/etc/grs/systems.conf deleted file mode 100644 index e7eb989..0000000 --- a/core/etc/grs/systems.conf +++ /dev/null @@ -1,3 +0,0 @@ -[tinhat-xfce4] -repo_uri : git://anongit.gentoo.org/proj/grs.git -stage_uri : http://distfiles.gentoo.org/releases/amd64/autobuilds/current-stage3-amd64-hardened/stage3-amd64-hardened-20150910.tar.bz2 diff --git a/core/etc/lilo.conf b/core/etc/lilo.conf deleted file mode 100644 index 229c947..0000000 --- a/core/etc/lilo.conf +++ /dev/null @@ -1,16 +0,0 @@ -lba32 -boot = /dev/sda -map = /boot/.map -install = /boot-menu.b -menu-scheme=Wb -#prompt -#delay = 5 -timeout = 50 -vga = normal - -image = /boot/kernel - root = /dev/sda3 - initrd = /boot/initramfs - append = "root=/dev/ram0 real_root=/dev/sda3" - label = Gentoo - read-only diff --git a/core/var/lib/portage/world.CYCLE.3 b/core/var/lib/portage/world.CYCLE.1 similarity index 76% rename from core/var/lib/portage/world.CYCLE.3 rename to core/var/lib/portage/world.CYCLE.1 index 5d0dbb0..86ad21d 100644 --- a/core/var/lib/portage/world.CYCLE.3 +++ b/core/var/lib/portage/world.CYCLE.1 @@ -5,15 +5,8 @@ app-editors/gedit app-editors/nano app-editors/vim app-office/abiword -app-office/gnumeric -app-portage/gentoolkit -app-portage/grs -app-portage/layman app-text/evince app-text/tree -dev-lang/python -dev-lang/tcl -dev-libs/gmp dev-util/strace dev-vcs/git gnome-extra/gnome-system-monitor @@ -30,7 +23,6 @@ net-dns/bind-tools net-fs/samba net-ftp/lftp net-irc/hexchat -net-mail/dovecot net-misc/openntpd net-misc/rdate net-misc/tor @@ -41,17 +33,8 @@ sys-apps/dbus sys-apps/elfix sys-apps/gradm sys-apps/less -sys-apps/paxctl sys-apps/pciutils -sys-boot/lilo -sys-devel/gdb sys-fs/cryptsetup -sys-kernel/genkernel -sys-kernel/linux-firmware -sys-libs/cracklib -sys-libs/db -sys-libs/gdbm -sys-process/fcron sys-process/lsof www-client/midori x11-base/xorg-server diff --git a/core/var/lib/portage/world.CYCLE.2 b/core/var/lib/portage/world.CYCLE.2 index b143a0d..c3f25b1 100644 --- a/core/var/lib/portage/world.CYCLE.2 +++ b/core/var/lib/portage/world.CYCLE.2 @@ -5,14 +5,9 @@ app-editors/gedit app-editors/nano app-editors/vim app-office/abiword -app-portage/gentoolkit -app-portage/grs -app-portage/layman +app-office/gnumeric app-text/evince app-text/tree -dev-lang/python -dev-lang/tcl -dev-libs/gmp dev-util/strace dev-vcs/git gnome-extra/gnome-system-monitor @@ -29,7 +24,6 @@ net-dns/bind-tools net-fs/samba net-ftp/lftp net-irc/hexchat -net-mail/dovecot net-misc/openntpd net-misc/rdate net-misc/tor @@ -40,16 +34,9 @@ sys-apps/dbus sys-apps/elfix sys-apps/gradm sys-apps/less -sys-apps/paxctl sys-apps/pciutils -sys-boot/lilo -sys-devel/gdb sys-fs/cryptsetup -sys-kernel/genkernel -sys-kernel/linux-firmware -sys-libs/cracklib -sys-libs/db -sys-libs/gdbm +sys-process/fcron sys-process/lsof www-client/midori x11-base/xorg-server diff --git a/scripts/cycle.1.sh b/scripts/cycle.1.sh index 148a344..8e5d673 100644 --- a/scripts/cycle.1.sh +++ b/scripts/cycle.1.sh @@ -2,10 +2,10 @@ source /etc/profile env-update -emerge -b1q portage -emerge -b1q app-portage/grs +emerge -1q portage +emerge -1q app-portage/grs emerge --unmerge sys-fs/udev -emerge -b1q sys-fs/eudev +emerge -1q sys-fs/eudev install-worldconf -emerge -bevq --keep-going --with-bdeps=y @world +emerge -evq --keep-going --with-bdeps=y @world clean-worldconf diff --git a/scripts/cycle.2.sh b/scripts/cycle.2.sh index 53d7c3b..e99ace0 100644 --- a/scripts/cycle.2.sh +++ b/scripts/cycle.2.sh @@ -3,7 +3,8 @@ source /etc/profile env-update install-worldconf -emerge -buvNDq --keep-going --with-bdeps=y @world +emerge -uvNDq --keep-going --with-bdeps=y @world clean-worldconf -emerge -bq @preserved-rebuild +emerge --unmerge app-portage/grs +emerge -q @preserved-rebuild emerge --depclean