Sophie Hirn 6 years ago
parent
commit
d7eb5f1c4d
25 changed files with 528 additions and 2 deletions
  1. +1
    -0
      .beacon/index
  2. +1
    -0
      .beacon/need
  3. +1
    -0
      .gitignore
  4. +0
    -2
      README.md
  5. +6
    -0
      etc/X11/xorg.conf.d/00-keyboard.conf
  6. +9
    -0
      etc/X11/xorg.conf.d/00-mouse.conf
  7. +1
    -0
      etc/portage/env/notmpfs
  8. +84
    -0
      etc/portage/make.conf.d/base
  9. +54
    -0
      etc/portage/make.conf.d/gui
  10. +3
    -0
      etc/portage/package.accept_keywords/50-haskell
  11. +8
    -0
      etc/portage/package.mask/50-buggered
  12. +5
    -0
      etc/portage/package.use/50-system
  13. +46
    -0
      etc/portage/patches/sys-apps/portage/portage-align.patch
  14. +9
    -0
      etc/portage/postsync.d/eix
  15. +29
    -0
      etc/portage/repo.postsync.d/egencache
  16. +8
    -0
      etc/portage/repos.conf/gentoo.conf
  17. +4
    -0
      etc/portage/repos.conf/ws-ovl.conf
  18. +30
    -0
      etc/portage/sets/base
  19. +55
    -0
      etc/portage/sets/cli
  20. +8
    -0
      etc/portage/sets/devel
  21. +72
    -0
      etc/portage/sets/gui
  22. +5
    -0
      etc/portage/sets/haskell
  23. +5
    -0
      etc/portage/sets/x86
  24. +42
    -0
      usr/local/bin/kernel-rebuild
  25. +42
    -0
      usr/local/bin/kernel-upgrade

+ 1
- 0
.beacon/index View File

@@ -0,0 +1 @@
/ .

+ 1
- 0
.beacon/need View File

@@ -0,0 +1 @@
sed-compose-key

+ 1
- 0
.gitignore View File

@@ -0,0 +1 @@
visited

+ 0
- 2
README.md View File

@@ -1,2 +0,0 @@
# gentoo-beacon


+ 6
- 0
etc/X11/xorg.conf.d/00-keyboard.conf View File

@@ -0,0 +1,6 @@
Section "InputClass"
Identifier "system-keyboad"
MatchIsKeyboard "True"
Option "XkbLayout" "us"
Option "XkbOptions" "compose:{%{compose-key}%}"
EndSection

+ 9
- 0
etc/X11/xorg.conf.d/00-mouse.conf View File

@@ -0,0 +1,9 @@
Section "InputClass"
Identifier "Disable mosue acceleration"
MatchIsPointer "on"
MatchDevicePath "/dev/input/event*"

Option "AccelerationNumerator" "0"
Option "AccelerationDenominator" "1"
Option "AccelerationThreshold" "0"
EndSection

+ 1
- 0
etc/portage/env/notmpfs View File

@@ -0,0 +1 @@
PORTAGE_TMPDIR="/var/tmp/notmpfs"

+ 84
- 0
etc/portage/make.conf.d/base View File

@@ -0,0 +1,84 @@
#!/bin/bash



# -- Portage configuration --

CFLAGS="-O2 -march=native"
CXXFLAGS="${CFLAGS}"

PORTDIR="/usr/portage"
DISTDIR="/var/lib/portage/distfiles"
PKGDIR="/var/lib/portage/packages"
SQTMPDIR="/var/tmp/portage-squash"
SQCOMP="lz4"
SQBS="1M"

MAKEOPTS=""

EMERGE_DEFAULT_OPTS="
--alert
--ask
--autounmask-continue
--backtrack=30
--keep-going
--quiet-build
--tree
--verbose-slot-rebuilds=n
--changed-deps-report=n
"

PORTAGE_NICENESS="19"

FEATURES=""

# -- Build targets and keywords --

ABI_X86="64"
ACCEPT_KEYWORDS="amd64"

# -- Language options --

L10N="en"
LINGUAS="${L10N}"

# -- Packages configuration --

USE="
berkdb
-bindist
cdb
consolekit
dbus
gpm
icu
ipc
jemalloc
jemalloc3
luajit
ncurses
nfs
nfsv4
nfsv41
-nls
offensive
pgo
policykit
-rdoc
threads
udev
unicode

system-boost
system-cairo
system-ffmpeg
system-harfbuzz
system-icu
system-jpeg
system-libevent
system-libs
system-libvpx
system-llvm
system-lua
system-sqlite
"

+ 54
- 0
etc/portage/make.conf.d/gui View File

@@ -0,0 +1,54 @@
#!/bin/bash

# Intended to be used with a desktop profile.



# -- Peripherals configuration

INPUT_DEVICES="${INPUT_DEVICES}
evdev
keyboard
mouse
"

# -- Packages configuration --

USE="${USE}
cleartype
corefonts
fluidsynth
fontconfig
fontforge
gtk
harfbuzz
imlib
-ldap
midi
nls
nsplugin
pulseaudio
smpeg
sound
timidity
v4l
xetex
xft
xinerama

raw

aacplus
amr
amrenc
celt
gstreamer
lame
opus
speex
theora
twolame
vpx
wavpack
x265
"

+ 3
- 0
etc/portage/package.accept_keywords/50-haskell View File

@@ -0,0 +1,3 @@
# Almost everything about haskell is somewhat considered unstable
*/*::haskell ~amd64
dev-haskell/* ~amd64

+ 8
- 0
etc/portage/package.mask/50-buggered View File

@@ -0,0 +1,8 @@
# New convoluted config system w/o backwards compat, fuck this.
>=x11-misc/rofi-1.4

# Breaks compton
>=media-libs/mesa-18

# https://bugs.gentoo.org/641550
>=dev-libs/libcdio-1.1.0

+ 5
- 0
etc/portage/package.use/50-system View File

@@ -0,0 +1,5 @@
app-portage/layman bazaar cvs darcs g-sorcery git gpg mercurial subversion sync-plugin-portage
media-sound/pulseaudio alsa-plugin realtime
net-misc/iputils arping tracepath traceroute
sys-kernel/ck-sources experimental
x11-libs/libdrm libkms

+ 46
- 0
etc/portage/patches/sys-apps/portage/portage-align.patch View File

@@ -0,0 +1,46 @@
diff --git a/pym/_emerge/MergeListItem.py b/pym/_emerge/MergeListItem.py
index 938f8014a..3b296b1b9 100644
--- a/pym/_emerge/MergeListItem.py
+++ b/pym/_emerge/MergeListItem.py
@@ -46,7 +46,7 @@ class MergeListItem(CompositeTask):
world_atom = self.world_atom
ldpath_mtimes = mtimedb["ldpath"]
- action_desc = "Emerging"
+ action_desc = "Emerging "
preposition = "for"
pkg_color = "PKG_MERGE"
if pkg.type_name == "binary":
@@ -54,11 +54,12 @@ class MergeListItem(CompositeTask):
action_desc += " binary"
if build_opts.fetchonly:
- action_desc = "Fetching"
+ action_desc = "Fetching "
+ number_width = len(str(pkg_count.maxval))
msg = "%s (%s of %s) %s" % \
(action_desc,
- colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval)),
+ colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval).rjust(number_width)),
colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval)),
colorize(pkg_color, pkg.cpv + _repo_separator + pkg.repo))
diff --git a/pym/_emerge/PackageMerge.py b/pym/_emerge/PackageMerge.py
index 1e7b58ba3..220db42bd 100644
--- a/pym/_emerge/PackageMerge.py
+++ b/pym/_emerge/PackageMerge.py
@@ -21,10 +21,11 @@ class PackageMerge(CompositeTask):
preposition = "from"
counter_str = ""
else:
- action_desc = "Installing"
+ action_desc = "Installing "
preposition = "to"
+ number_width = len(str(pkg_count.maxval))
counter_str = "(%s of %s) " % \
- (colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval)),
+ (colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval).rjust(number_width)),
colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval)))
msg = "%s %s%s" % \

+ 9
- 0
etc/portage/postsync.d/eix View File

@@ -0,0 +1,9 @@
#!/bin/sh

if [[ -e /var/cache/eix/portage.eix ]]; then
cp -a /var/cache/eix/portage.eix /var/cache/eix/previous.eix;
fi
eix-update
if [[ -e /var/cache/eix/previous.eix ]]; then
eix-diff;
fi

+ 29
- 0
etc/portage/repo.postsync.d/egencache View File

@@ -0,0 +1,29 @@
#!/bin/sh

repository_name=${1}
sync_uri=${2}
repository_path=${3}
n_cpus=$(grep -c processor /proc/cpuinfo)

# Portage assumes that a hook succeeded if it exits with 0 code. If no
# explicit exit is done, the exit code is the exit code of last spawned
# command. Since our script is a bit more complex, we want to control
# the exit code explicitly.
ret=0

if [ -n "${repository_name}" ]; then
echo "* In post-repository hook for ${repository_name}"
echo "** synced from remote repository ${sync_uri}"
echo "** synced into ${repository_path}"

if [ "${repository_name}" != "gentoo" ]; then
if ! egencache --update --repo="${repository_name}" --jobs=${n_cpus} --load-average=${n_cpus}; then
echo "!!! egencache failed!"
ret=1
fi
fi
fi


# Return explicit status.
exit "${ret}"

+ 8
- 0
etc/portage/repos.conf/gentoo.conf View File

@@ -0,0 +1,8 @@
[DEFAULT]
main-repo = gentoo

[gentoo]
location = /usr/portage
sync-type = git
sync-uri = https://github.com/gentoo-mirror/gentoo.git
auto-sync = yes

+ 4
- 0
etc/portage/repos.conf/ws-ovl.conf View File

@@ -0,0 +1,4 @@
[ws-ovl]
priority = 50
location = /usr/local/portage/ws-ovl
auto-sync = No

+ 30
- 0
etc/portage/sets/base View File

@@ -0,0 +1,30 @@
# Base system
app-admin/logrotate
app-admin/sysklogd
app-editors/nano
net-misc/dhcpcd
net-misc/netifrc
sys-apps/mlocate
sys-kernel/linux-firmware
sys-process/cronie


# Portage goodies
app-portage/eix
app-portage/genlop
app-portage/gentoolkit
app-portage/layman
app-portage/portage-squash


# Other useful stuff
app-backup/snapper
app-admin/sudo
app-shells/bash-completion
app-text/tree
net-misc/ntp
sys-apps/dbus
sys-auth/polkit
sys-fs/btrfs-progs
sys-process/htop
sys-process/lsof

+ 55
- 0
etc/portage/sets/cli View File

@@ -0,0 +1,55 @@
# Essentials
app-arch/lzop
app-arch/unrar
app-misc/neofetch
app-misc/screen
dev-vcs/git
media-fonts/terminus-font


# Otherwise useful
app-misc/todo
media-gfx/tiv
net-analyzer/netcat
net-analyzer/nettop
net-dns/bind-tools
net-fs/cifs-utils
net-fs/curlftpfs
net-fs/davfs2
net-fs/nfs-utils
net-misc/whois
net-vpn/openvpn
sys-apps/smartmontools
sys-apps/usbutils
sys-process/glances
www-client/elinks
www-client/w3m


# Should be installed on any dignified linux box
app-misc/sl
app-misc/toilet
games-misc/cowsay
games-misc/fortune-mod
games-misc/lolcat


# Fortune cookies
games-misc/fortune-mod-at-linux
games-misc/fortune-mod-bofh-excuses
games-misc/fortune-mod-chucknorris
games-misc/fortune-mod-dubya
games-misc/fortune-mod-flashrider
games-misc/fortune-mod-futurama
games-misc/fortune-mod-fvl
games-misc/fortune-mod-gentoo-dev
games-misc/fortune-mod-gentoo-forums
games-misc/fortune-mod-homer
games-misc/fortune-mod-kernelcookies
games-misc/fortune-mod-osfortune
games-misc/fortune-mod-powerpuff
games-misc/fortune-mod-simpsons-chalkboard
games-misc/fortune-mod-slackware
games-misc/fortune-mod-starwars
games-misc/fortune-mod-taow
games-misc/fortune-mod-zx-error

+ 8
- 0
etc/portage/sets/devel View File

@@ -0,0 +1,8 @@
# Development toolkit
app-text/dos2unix
dev-java/gradle
dev-lang/lua
dev-util/cloc
dev-util/valgrind
sys-devel/gdb
virtual/jdk

+ 72
- 0
etc/portage/sets/gui View File

@@ -0,0 +1,72 @@
# Getting a desktop
media-sound/pavucontrol
media-sound/pulseaudio
virtual/notification-daemon
www-client/firefox
x11-apps/xinput
x11-apps/xrandr
x11-apps/xset
x11-base/xorg-drivers
x11-base/xorg-server
x11-misc/compton
x11-misc/dmenu
x11-misc/light-locker
x11-misc/lightdm
x11-misc/lightdm-gtk-greeter
x11-misc/numlockx
x11-misc/xclip
x11-misc/xmobar
x11-misc/xvkbd
x11-terms/xterm
x11-themes/adwaita-icon-theme
x11-themes/arc-theme
x11-themes/arc-theme-red
x11-wm/xmonad
x11-wm/xmonad-contrib


# gtk+ hook reload
dev-python/pygtk


# Some fonts
media-fonts/corefonts
media-fonts/symbola


# Wallpaper
media-gfx/feh


# Set root window cursor
x11-apps/xsetroot


# Applications
app-admin/pass
app-office/libreoffice
app-text/antiword
app-text/gv
app-text/texlive
app-text/xournal
media-fonts/exo
media-fonts/noto
media-gfx/geeqie
media-gfx/imagemagick
media-gfx/inkscape
media-gfx/opcion
media-gfx/pinta
media-gfx/scrot
media-sound/audacity
media-video/vlc
net-misc/nextcloud-client
net-misc/youtube-dl
net-print/hplip
sys-fs/dosfstools
x11-misc/redshift
x11-apps/xbacklight


# Mail stuff
mail-client/mutt
net-mail/offlineimap

+ 5
- 0
etc/portage/sets/haskell View File

@@ -0,0 +1,5 @@
app-editors/wsedit
dev-haskell/haskell-platform
dev-haskell/hscolour
dev-haskell/ipprint
dev-haskell/stack

+ 5
- 0
etc/portage/sets/x86 View File

@@ -0,0 +1,5 @@
app-admin/eclean-kernel
app-portage/cpuid2cpuflags
sys-apps/pciutils
sys-boot/grub
sys-kernel/genkernel

+ 42
- 0
usr/local/bin/kernel-rebuild View File

@@ -0,0 +1,42 @@
#!/bin/bash

nCpus=$(cat /proc/cpuinfo | grep processor | wc -l)
green="`tput setaf 2`"
blue="`tput setaf 4`"
cyan="`tput setaf 6`"
reset="`tput sgr0`"



if [ `whoami` != "root" ]; then
echo "Must run as root."

else
cd /usr/src/linux

echo "${cyan}Updating kernel config${reset}"
make silentoldconfig -s

echo "${cyan}Building kernel${reset}"
make modules_prepare -s && \
nice -n 19 make -j$nCpus -l$nCpus -s && \
nice -n 19 make modules -j$nCpus -l$nCpus -s && \

if uname -r | grep -q "raspberry"; then
echo "${cyan}Installing kernel for Raspberry Pi${reset}"
cp /boot/kernel7.img /boot/kernel7.img.old
cp arch/arm/boot/zImage /boot/kernel7.img
make modules_install
cp arch/arm/boot/dts/*.dtb /boot/
cp arch/arm/boot/dts/overlays/* /boot/overlays/
else
echo "${cyan}Installing kernel${reset}"
eclean-kernel -n 3
make install -s
make modules_install -s

echo "${cyan}Post processing${reset}"
genkernel --install --btrfs initramfs >/dev/null && \
grub-mkconfig -o /boot/grub/grub.cfg 2>/dev/null
fi
fi

+ 42
- 0
usr/local/bin/kernel-upgrade View File

@@ -0,0 +1,42 @@
#!/bin/bash

nCpus=$(cat /proc/cpuinfo | grep processor | wc -l)
red="`tput setaf 1`"
green="`tput setaf 2`"
blue="`tput setaf 4`"
reset="`tput sgr0`"



if [ `whoami` != "root" ]; then
echo "Must run as root."

else
oldName="linux-$(uname -r)"
if [ -n "$1" ]; then
kernName=$(ls /usr/src | grep linux- | grep "$1" | sort -rVt '-' -k 2 | head -n 1)

else
kernName=$(ls /usr/src | grep linux- | sort -rVt '-' -k 2 | head -n 1)

fi

if [ "$kernName" == "$oldName" ]; then
echo "Kernel is up to date."
exit 1
fi

echo "About to process $green$kernName$reset (from $red$oldName$reset)."
echo -n "Continue? [y|N] "
read -n 1 answer
echo

if [ "$answer" == " " -o "$answer" == "y" -o "$answer" == "Y" ]; then
echo "Setting kernel symlink to $green$kernName$reset"
eselect kernel set $kernName
cd /usr/src/linux
zcat /proc/config.gz >.config

kernel-rebuild
fi
fi

Loading…
Cancel
Save