From cc40703072deb3f76873f7ee1210a555421794b1 Mon Sep 17 00:00:00 2001 From: anomen Date: Mon, 4 Jan 2016 23:57:03 +0100 Subject: [PATCH] zax updates --- zax/CONFIG.TXT | 3 +- zax/customs/etc/conf.d/modules | 2 +- zax/customs/etc/fstab | 3 +- zax/customs/etc/make.conf | 15 ++-- zax/customs/etc/mplayer/mplayer.conf | 13 +-- zax/customs/etc/portage/package.keywords/hg | 2 + zax/customs/etc/portage/package.keywords/java | 5 +- zax/customs/etc/portage/package.keywords/media | 1 + zax/customs/etc/portage/package.keywords/misc | 11 +++ zax/customs/etc/portage/package.keywords/net | 5 ++ zax/customs/etc/portage/package.keywords/req | 4 +- zax/customs/etc/portage/package.mask/gnome | 1 + zax/customs/etc/portage/package.mask/req | 3 + zax/customs/etc/portage/package.mask/virtualbox | 5 ++ zax/customs/etc/portage/package.unmask/opera | 1 + zax/customs/etc/portage/package.unmask/req | 1 + zax/customs/etc/portage/package.use/games | 1 + zax/customs/etc/portage/package.use/java | 3 + zax/customs/etc/portage/package.use/media | 1 + zax/customs/etc/portage/package.use/misc | 2 + zax/customs/etc/portage/package.use/required | 42 ++++----- zax/customs/etc/rc.conf | 111 ++++++++++++++++++++---- 22 files changed, 181 insertions(+), 54 deletions(-) create mode 100644 zax/customs/etc/portage/package.keywords/hg create mode 100644 zax/customs/etc/portage/package.keywords/media create mode 100644 zax/customs/etc/portage/package.keywords/misc create mode 100644 zax/customs/etc/portage/package.mask/req create mode 100644 zax/customs/etc/portage/package.mask/virtualbox create mode 100644 zax/customs/etc/portage/package.unmask/opera create mode 100644 zax/customs/etc/portage/package.unmask/req create mode 100644 zax/customs/etc/portage/package.use/games rewrite zax/customs/etc/portage/package.use/required (79%) diff --git a/zax/CONFIG.TXT b/zax/CONFIG.TXT index cb5d25b..5c4e3a1 100644 --- a/zax/CONFIG.TXT +++ b/zax/CONFIG.TXT @@ -71,4 +71,5 @@ TODO ==== - +* CONFIG_IKCONFIG=m ++ CONFIG_IPV6 diff --git a/zax/customs/etc/conf.d/modules b/zax/customs/etc/conf.d/modules index 0ccd189..5bdc930 100644 --- a/zax/customs/etc/conf.d/modules +++ b/zax/customs/etc/conf.d/modules @@ -22,5 +22,5 @@ # You should consult your kernel documentation and configuration # for a list of modules and their options. -modules="vboxsf vboxvideo virtio_net" +modules="ext4 vboxsf vboxvideo virtio_net msr snd-pcm-oss snd-mixer-oss" diff --git a/zax/customs/etc/fstab b/zax/customs/etc/fstab index 9c4b0a8..6639b5c 100644 --- a/zax/customs/etc/fstab +++ b/zax/customs/etc/fstab @@ -24,8 +24,9 @@ shm /dev/shm tmpfs nodev,nosuid,noexec 0 0 /dev/sda1 / ext3 noatime 0 1 /dev/sda2 none swap sw 0 0 +#/dev/sdc /share ext4 noatime 0 1 /dev/cdrom /mnt/cdrom auto noauto,user 0 0 -/dev/mapper/home /home ext3 rw,noatime 0 0 +/dev/mapper/home /home ext4 rw,noatime 0 0 diff --git a/zax/customs/etc/make.conf b/zax/customs/etc/make.conf index 015f283..0145d65 100644 --- a/zax/customs/etc/make.conf +++ b/zax/customs/etc/make.conf @@ -3,13 +3,13 @@ # built this stage. # Please consult /usr/share/portage/config/make.conf.example for a more # detailed example. -CFLAGS="-O2 -fomit-frame-pointer -march=prescott -pipe" +CFLAGS="-O2 -fomit-frame-pointer -march=prescott -pipe -fno-stack-protector" CXXFLAGS="${CFLAGS}" # WARNING: Changing your CHOST is not something that should be done lightly. # Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing. CHOST="i686-pc-linux-gnu" -MAKEOPTS="-j2" +MAKEOPTS="-j3" FEATURES="protect-owned userpriv usersandbox userfetch -preserve-libs" @@ -19,8 +19,6 @@ GENTOO_MIRRORS=" http://gentoo.mirror.dkm.cz/pub/gentoo/ http://gentoo.mirror.web4u.cz/" -SYNC="rsync://rsync.cz.gentoo.org/gentoo-portage" - PORTAGE_NICENESS="15" @@ -46,8 +44,8 @@ USE="X xcomposite xinerama -qt-static qt3 qt4 qt3support -webkit sysfs 7zip gs timidity dmi kipi pango spell enchant hddtemp cgi gd mozdom javascript smime mbox pop gpgme djvu xforms ppds ansi syslog openssl bdf dbus replytolist ares idea -ruby expat xcb rtc mmap -device-mapper utempter - xprint hdri graphviz imlib zlib truetype freetype system-sqlite - enca lzo rar new-login + xprint hdri graphviz imlib zlib truetype freetype system-sqlite -geoloc + enca lzo rar new-login -gmp-autoupdate bzip2 zip lm_sensors sensord apm pmu fltk tokenizer regex gnutls gpm nls ncurses slang subversion mercurial cvs git sql xsl rtf libffi libnotify icu xosd fontconfig xpm bash-completion -redland" @@ -58,9 +56,9 @@ USE="${USE} wxwindows wxwidgets vxwindows" # database USE="${USE} mysqli mysql mssql sqlite3 sqlite soundex fts3 -odbc berkdb gdbm" #network -USE="${USE} jabber -ipv6 -geoip" +USE="${USE} jabber ipv6 -geoip offensive" # multimedia -USE="${USE} mp3 speex srt ogg vorbis aotuv ffmpeg x264 amr opencore-amr matroska theora aac mp4 mpeg2 id3 +USE="${USE} mp3 speex srt ogg vorbis aotuv ffmpeg x264 -libav amr opencore-amr matroska theora aac mp4 mpeg2 id3 dirac yv12 wma asf mp2 mod dvd dvdr dvdnav lame twolame dvdread flac reail xvid rtsp v4l v4l2 libmms mjpeg a52 dts mpeg vorbis-psy divx wavpack amrnb amrwb musepack mod cdda vcd cdparanoia opus" # graphics @@ -76,6 +74,7 @@ USE="${USE} cz_prog" PHP_TARGETS="php5-4 php5-5" +CPU_FLAGS_X86="mmx mmxext sse sse2 sse3 ssse3" INPUT_DEVICES="virtualbox keyboard mouse evdev" diff --git a/zax/customs/etc/mplayer/mplayer.conf b/zax/customs/etc/mplayer/mplayer.conf index 0fa7e53..7b86085 100644 --- a/zax/customs/etc/mplayer/mplayer.conf +++ b/zax/customs/etc/mplayer/mplayer.conf @@ -57,7 +57,7 @@ vo=x11 # Enable software scaling (powerful CPU needed) for video output # drivers that do not support hardware scaling. -#zoom=yes +zoom=yes # standard monitor size, with square pixels #monitoraspect=4:3 @@ -131,10 +131,10 @@ vo=x11 # cache settings # # Use 8MB input cache by default. -#cache = 8192 +cache = 32000 # # Prefill 20% of the cache before starting playback. -#cache-min = 20.0 +cache-min = 0.05 # # Prefill 50% of the cache before restarting playback after the cache emptied. #cache-seek-min = 50 @@ -174,8 +174,9 @@ vo=x11 [default] fontconfig=1 subcp=utf8 -subfont-osd-scale=4 -subfont-text-scale=3 +subfont-osd-scale=20 +subfont-text-scale=30 unrarexec=/usr/bin/unrar progbar-align=0 - + +subfont-autoscale=0 diff --git a/zax/customs/etc/portage/package.keywords/hg b/zax/customs/etc/portage/package.keywords/hg new file mode 100644 index 0000000..5916d5b --- /dev/null +++ b/zax/customs/etc/portage/package.keywords/hg @@ -0,0 +1,2 @@ +=dev-vcs/tortoisehg-3.5.1* +=dev-vcs/mercurial-3.5.1* diff --git a/zax/customs/etc/portage/package.keywords/java b/zax/customs/etc/portage/package.keywords/java index d9ccbb7..01f3048 100644 --- a/zax/customs/etc/portage/package.keywords/java +++ b/zax/customs/etc/portage/package.keywords/java @@ -10,5 +10,8 @@ net-nds/ApacheDirectoryStudio ~dev-java/flyingsaucer-7 dev-java/commons-dbcp dev-util/idea-community +dev-util/idea-ultimate dev-util/soapui -<=dev-vcs/mercurial-3.0 +dev-java/jdbc-mssqlserver +dev-java/keystore-explorer +dev-util/idea-ultimate-14* diff --git a/zax/customs/etc/portage/package.keywords/media b/zax/customs/etc/portage/package.keywords/media new file mode 100644 index 0000000..837a630 --- /dev/null +++ b/zax/customs/etc/portage/package.keywords/media @@ -0,0 +1 @@ +=media-video/mkvalidator-0.4.2* diff --git a/zax/customs/etc/portage/package.keywords/misc b/zax/customs/etc/portage/package.keywords/misc new file mode 100644 index 0000000..ca38546 --- /dev/null +++ b/zax/customs/etc/portage/package.keywords/misc @@ -0,0 +1,11 @@ +app-editors/atom +dev-util/atom-shell +=sys-devel/llvm-3.4.2 +=sys-devel/llvm-3.5.0 +=sys-devel/clang-3.4.2* +=sys-devel/clang-3.5.0* +app-text/unicode + +dev-util/lida +app-text/diffpdf +dev-vcs/git-crypt diff --git a/zax/customs/etc/portage/package.keywords/net b/zax/customs/etc/portage/package.keywords/net index 972af7b..87177a9 100644 --- a/zax/customs/etc/portage/package.keywords/net +++ b/zax/customs/etc/portage/package.keywords/net @@ -1,3 +1,8 @@ net-libs/libbt mail-mta/spamsink net-proxy/cntlm +media-video/get_flash_videos +dev-perl/SMTP-Server +net-misc/freerapid-downloader +www-client/opera + diff --git a/zax/customs/etc/portage/package.keywords/req b/zax/customs/etc/portage/package.keywords/req index 2ac784e..0d22eb4 100644 --- a/zax/customs/etc/portage/package.keywords/req +++ b/zax/customs/etc/portage/package.keywords/req @@ -1,5 +1,7 @@ # rules here are only for sake of successful emerge. -# can be remnoved when not necessary +# can be removed when not necessary =media-video/mpeg-tools-1.5b-r5 +=www-client/firefox-38* + diff --git a/zax/customs/etc/portage/package.mask/gnome b/zax/customs/etc/portage/package.mask/gnome index ed5ac05..2cc5033 100644 --- a/zax/customs/etc/portage/package.mask/gnome +++ b/zax/customs/etc/portage/package.mask/gnome @@ -10,3 +10,4 @@ gnome-base/libbonobo >=gnome-base/gdm-3.0.0 +>gnome-base/gsettings-desktop-schemas-3.10 diff --git a/zax/customs/etc/portage/package.mask/req b/zax/customs/etc/portage/package.mask/req new file mode 100644 index 0000000..024869c --- /dev/null +++ b/zax/customs/etc/portage/package.mask/req @@ -0,0 +1,3 @@ +=sys-libs/readline-6.3 +=media-libs/libvpx-1.4.0 +=sys-devel/llvm-3.5.0* diff --git a/zax/customs/etc/portage/package.mask/virtualbox b/zax/customs/etc/portage/package.mask/virtualbox new file mode 100644 index 0000000..f2b4735 --- /dev/null +++ b/zax/customs/etc/portage/package.mask/virtualbox @@ -0,0 +1,5 @@ +# mouse is not respondin in top-left 800x600 region of screen +# might be caused by these, to be confirmed + +>=app-emulation/virtualbox-guest-additions-5.0.0 +>=x11-drivers/xf86-video-virtualbox-5.0.0 diff --git a/zax/customs/etc/portage/package.unmask/opera b/zax/customs/etc/portage/package.unmask/opera new file mode 100644 index 0000000..48453d6 --- /dev/null +++ b/zax/customs/etc/portage/package.unmask/opera @@ -0,0 +1 @@ +www-client/opera diff --git a/zax/customs/etc/portage/package.unmask/req b/zax/customs/etc/portage/package.unmask/req new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/zax/customs/etc/portage/package.unmask/req @@ -0,0 +1 @@ + diff --git a/zax/customs/etc/portage/package.use/games b/zax/customs/etc/portage/package.use/games new file mode 100644 index 0000000..c7dbe68 --- /dev/null +++ b/zax/customs/etc/portage/package.use/games @@ -0,0 +1 @@ +games-fps/lsdldoom freedoom diff --git a/zax/customs/etc/portage/package.use/java b/zax/customs/etc/portage/package.use/java index 63f0377..721801c 100644 --- a/zax/customs/etc/portage/package.use/java +++ b/zax/customs/etc/portage/package.use/java @@ -1,4 +1,6 @@ +dev-java/oracle-jdk-bin doc + ##depends on FF2 dev-java/swt -firefox xulrunner @@ -29,3 +31,4 @@ sys-devel/gcc gcj -libffi dev-java/commons-collections test-framework dev-java/sun-jdk source dev-java/sun-jdk doc +dev-java/oracle-jdk-bin source diff --git a/zax/customs/etc/portage/package.use/media b/zax/customs/etc/portage/package.use/media index 69c3904..297da7b 100644 --- a/zax/customs/etc/portage/package.use/media +++ b/zax/customs/etc/portage/package.use/media @@ -1,2 +1,3 @@ media-video/vlc lua media-libs/sdl-mixer midi +media-video/mplayer bidi diff --git a/zax/customs/etc/portage/package.use/misc b/zax/customs/etc/portage/package.use/misc index 81da023..feb1984 100644 --- a/zax/customs/etc/portage/package.use/misc +++ b/zax/customs/etc/portage/package.use/misc @@ -101,3 +101,5 @@ media-video/gpac -javascript dev-db/sqlite unlock-notify sys-libs/zlib minizip +sys-devel/llvm clang +dev-python/irc examples diff --git a/zax/customs/etc/portage/package.use/required b/zax/customs/etc/portage/package.use/required dissimilarity index 79% index 09fb3dd..b753aa2 100644 --- a/zax/customs/etc/portage/package.use/required +++ b/zax/customs/etc/portage/package.use/required @@ -1,20 +1,22 @@ -dev-lang/lua deprecated -media-libs/libvpx -ssse3 -sys-power/upower deprecated -# bug? - compiel failed -#media-video/mediainfo -libmms -#media-libs/libmediainfo -libmms - -net-misc/curl -ares -#media-libs/libwmf -expat - -#bug:267749 -#dev-libs/openssl -kerberos - -#no gdm -x11-misc/xscreensaver -new-login -net-misc/curl -adns -net-analyzer/wireshark -qt4 - -dev-java/dbvis -mssql - +# rules here are only for sake of successful emerge. +# can be removed when not necessary + +dev-libs/openssl -tls-heartbeat +net-misc/curl -adns +net-analyzer/wireshark -qt4 +sys-fs/cryptsetup -gcrypt -kernel +dev-libs/elfutils static-libs +#app-crypt/mit-krb5 -pkinit +dev-lang/lua deprecated +net-misc/openssh -X509 +app-crypt/qca gpg +media-gfx/dcraw -lcms +media-video/xine-ui -readline +media-libs/libvpx postproc +dev-libs/libgit2-glib ssh +dev-libs/libgit2 ssh +app-crypt/pinentry gnome-keyring +dev-java/icedtea-web -icedtea7 + +www-client/firefox system-cairo system-jpeg system-icu system-sqlite system-libvpx system-libs. + diff --git a/zax/customs/etc/rc.conf b/zax/customs/etc/rc.conf index 8e15bb6..7207486 100644 --- a/zax/customs/etc/rc.conf +++ b/zax/customs/etc/rc.conf @@ -7,8 +7,8 @@ # WARNING: whilst we have improved parallel, it can still potentially lock # the boot process. Don't file bugs about this unless you can supply # patches that fix it without breaking other things! -rc_parallel="YES" -#rc_parallel="NO" +#rc_parallel="YES" +rc_parallel="NO" # Set rc_interactive to "YES" and you'll be able to press the I key during # boot so you can choose to start specific services. Set to "NO" to disable @@ -52,6 +52,10 @@ rc_shell=/sbin/sulogin # The default value is: /var/log/rc.log #rc_log_path="/var/log/rc.log" +# If you want verbose output for OpenRC, set this to yes. If you want +# verbose output for service foo only, set it to yes in /etc/conf.d/foo. +#rc_verbose=no + # By default we filter the environment for our running scripts. To allow other # variables through, add them here. Use a * to allow all variables through. #rc_env_allow="VAR1 VAR2" @@ -74,6 +78,10 @@ rc_shell=/sbin/sulogin #rc_crashed_stop=NO #rc_crashed_start=YES +# Set rc_nocolor to yes if you do not want colors displayed in OpenRC +# output. +#rc_nocolor=NO + ############################################################################## # MISC CONFIGURATION VARIABLES # There variables are shared between many init scripts @@ -81,9 +89,13 @@ rc_shell=/sbin/sulogin # Set unicode to YES to turn on unicode support for keyboards and screens. unicode="YES" +# This is how long fuser should wait for a remote server to respond. The +# default is 60 seconds, but it can be adjusted here. +#rc_fuser_timeout=60 + # Below is the default list of network fstypes. # -# afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs +# afs ceph cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre ncpfs # nfs nfs4 ocfs2 shfs smbfs # # If you would like to add to this list, you can do so by adding your @@ -95,12 +107,19 @@ unicode="YES" # These variables are documented here, but should be configured in # /etc/conf.d/foo for service foo and NOT enabled here unless you # really want them to work on a global basis. +# If your service has characters in its name which are not legal in +# shell variable names and you configure the variables for it in this +# file, those characters should be replaced with underscores in the +# variable names as shown below. # Some daemons are started and stopped via start-stop-daemon. # We can set some things on a per service basis, like the nicelevel. -#export SSD_NICELEVEL="-19" +#SSD_NICELEVEL="-19" # Pass ulimit parameters +# If you are using bash in POSIX mode for your shell, note that the +# ulimit command uses a block size of 512 bytes for the -c and -f +# options #rc_ulimit="-u 30" # It's possible to define extra dependencies for services like so @@ -117,6 +136,13 @@ unicode="YES" #rc_foo_need="openvpn" #rc_foo_after="clock" +# Below is an example for service foo-bar. Note that the '-' is illegal +# in a shell variable name, so we convert it to an underscore. +# example for service foo-bar. +#rc_foo_bar_config="/etc/foo-bar" +#rc_foo_bar_need="openvpn" +#rc_foo_bar_after="clock" + # You can also remove dependencies. # This is mainly used for saying which servies do NOT provide net. #rc_net_tap0_provide="!net" @@ -125,17 +151,16 @@ unicode="YES" # LINUX SPECIFIC OPTIONS # This is the subsystem type. Valid options on Linux: -# "" - nothing special -# "lxc" - Linux Containers -# "openvz" - Linux OpenVZ -# "prefix" - Prefix -# "uml" - Usermode Linux -# "vserver" - Linux vserver -# "xen0" - Xen0 Domain -# "xenU" - XenU Domain -# If this is commented out, automatic detection will be attempted. -# Note that autodetection will not work in a prefix environment or in a -# linux container. +# "" - nothing special +# "lxc" - Linux Containers +# "openvz" - Linux OpenVZ +# "prefix" - Prefix +# "uml" - Usermode Linux +# "vserver" - Linux vserver +# "systemd-nspawn" - Container created by the systemd-nspawn utility +# "xen0" - Xen0 Domain +# "xenU" - XenU Domain +# If this is commented out, automatic detection will be used. # # This should be set to the value representing the environment this file is # PRESENTLY in, not the virtualization the environment is capable of. @@ -145,3 +170,59 @@ rc_sys="" # consolefont, numlock, etc ...) rc_tty_number=12 +############################################################################## +# CGROUPS RESOURCE MANAGEMENT + +# If you have cgroups turned on in your kernel, this switch controls +# whether or not a group for each controller is mounted under +# /sys/fs/cgroup. +# None of the other options in this section work if this is set to "NO". +#rc_controller_cgroups="YES" + +# The following settings allow you to set up values for the cgroup +# controllers for your services. +# They can be set in this file;, however, if you do this, the settings +# will apply to all of your services. +# If you want different settings for each service, place the settings in +# /etc/conf.d/foo for service foo. +# The format is to specify the names of the settings followed by their +# values. Each variable can hold multiple settings. +# For example, you would use this to set the cpu.shares setting in the +# cpu controller to 512 for your service. +# rc_cgroup_cpu=" +# cpu.shares 512 +# " +# +#For more information about the adjustments that can be made with +#cgroups, see Documentation/cgroups/* in the linux kernel source tree. + +# Set the blkio controller settings for this service. +#rc_cgroup_blkio="" + +# Set the cpu controller settings for this service. +#rc_cgroup_cpu="" + +# Add this service to the cpuacct controller (any value means yes). +#rc_cgroup_cpuacct="" + +# Set the cpuset controller settings for this service. +#rc_cgroup_cpuset="" + +# Set the devices controller settings for this service. +#rc_cgroup_devices="" + +# Set the memory controller settings for this service. +#rc_cgroup_memory="" + +# Set the net_prio controller settings for this service. +#rc_cgroup_net_prio="" + +# Set this to YES if yu want all of the processes in a service's cgroup +# killed when the service is stopped or restarted. +# This should not be set globally because it kills all of the service's +# child processes, and most of the time this is undesirable. Please set +# it in /etc/conf.d/. +# To perform this cleanup manually for a stopped service, you can +# execute cgroup_cleanup with /etc/init.d/ cgroup_cleanup or +# rc-service cgroup_cleanup. +# rc_cgroup_cleanup="NO" -- 2.11.4.GIT