Merge branch 'develop' of git.calculate.ru:/repo/calculate into develop

mhiretskiy 1561
Alexander Tratsevskiy 6 years ago
commit faf206ac6b

@ -1 +1 @@
DIST steam_1.0.0.54.tar.gz 2750102 SHA256 42531bf2615afed54c333ae9afeebe8cb68a31304ddfcf90e61b3532a5597386 SHA512 1820f596359d829a4e119f1f916a741ecb7973d36684916cdbbfa435fcdc9c288852491fd6d0b064e8154a43c60d8dcce3c7ed9275aed8f5f116c2782489bf32 WHIRLPOOL e1e9e5b41dbdde07e93f4c959fe25e03f3c25f00964e306aa0887557782307706e0a352137ae6b264987cf3545eaa18b9fc2e0cd51cadbf22f306af20930e030
DIST steam_1.0.0.56.tar.gz 2899122 BLAKE2B a4955975b36d7916d634cd076356f61a90751bdda07aa87ea79ea2237c0b17b1377685f3d6ff41ad82e3921580dc4f3524fbfe45e5918a52c146ea4bd5393c5f SHA512 17fdd26b829a5860520d955326af88ebacda18183fbf9a70cbb38a9c593cc6c3e85237ec0be598e80a3e1d2bc4354a4933e372321ce0b8716ac481cfb3d7a5e0

@ -1,19 +0,0 @@
diff --git a/steam/steam b/steam/steam
index c1c8067..eaa6b09 100755
--- a/steam
+++ b/steam
@@ -3,6 +3,14 @@
# This is the Steam script that typically resides in /usr/bin
# It will create the Steam bootstrap if necessary and then launch steam.
+# Fix launch https://bbs.archlinux.org/viewtopic.php?id=219522
+if [[ $(arch) == "x86_64" ]]
+then
+ export LD_PRELOAD="/usr/lib32/libxcb.so.1"
+else
+ export LD_PRELOAD="/usr/lib/libxcb.so.1"
+fi
+
# Get the full name of this script
export STEAMSCRIPT="$(cd "${0%/*}" && echo "$PWD")/${0##*/}"

@ -1,166 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
# Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
# or come to #gentoo-gamerlay in freenode IRC
inherit eutils gnome2-utils linux-info prefix udev xdg
DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam client"
HOMEPAGE="http://steampowered.com"
SRC_URI="http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${PV}.tar.gz"
KEYWORDS="~amd64 ~x86"
LICENSE="ValveSteamLicense"
RESTRICT="bindist mirror"
SLOT="0"
IUSE="+steamruntime"
RDEPEND="
app-arch/tar
app-shells/bash
media-libs/libtxc_dxtn
net-misc/curl
|| (
>=gnome-extra/zenity-3
x11-terms/xterm
)
steamruntime? (
x11-libs/libX11[abi_x86_32]
x11-libs/libXau[abi_x86_32]
x11-libs/libxcb[abi_x86_32]
x11-libs/libXdmcp[abi_x86_32]
)
!steamruntime? (
>=games-util/steam-client-meta-0-r20141204[steamruntime?]
)
amd64? (
>=sys-devel/gcc-4.6.0[multilib]
>=sys-libs/glibc-2.15[multilib]
)
x86? (
>=sys-devel/gcc-4.6.0
>=sys-libs/glibc-2.15
)"
S=${WORKDIR}/steam/
PATCHES=(
"${FILESDIR}"/steam-fix-ld-library-path.patch
"${FILESDIR}"/steam-runtime-default.patch
"${FILESDIR}"/steam-set-distrib-release.patch
"${FILESDIR}"/steam-fix-joystick-detection.patch
"${FILESDIR}"/steam-fix-preload-libxcb.patch
)
pkg_setup() {
linux-info_pkg_setup
if ! { linux_config_exists && linux_chkconfig_present INPUT_UINPUT; }; then
ewarn "If you want to use the Steam controller, please make sure"
ewarn "CONFIG_INPUT_UINPUT is enabled in your kernel config."
# Device Drivers
# -> Input device support
# -> Miscellaneous devices
# -> User level driver support
fi
}
src_prepare() {
xdg_environment_reset
default
sed -i 's:TAG+="uaccess":\0, TAG+="udev-acl":g' \
lib/udev/rules.d/99-steam-controller-perms.rules || die
sed -i \
-e "s:@@DEBIAN_COMPAT@@:${EPREFIX}/usr/$(get_libdir)/debiancompat$(use amd64 && echo "\\:${EPREFIX}/usr/$(ABI=x86 get_libdir)/debiancompat"):g" \
-e "s:@@STEAM_RUNTIME@@:$(usex steamruntime 1 0):g" \
steam || die
# if STEAM_RUNTIME_PREFER_HOST_LIBRARIES is enabled, steam.sh wants to
# parse the output of ldconfig which is not in PATH for regular users
sed -i \
-e "s,export TEXTDOMAIN=steam,export TEXTDOMAIN=steam\nexport PATH=\${PATH}:/sbin/," steam || die
# Still need EPREFIX in the DEBIAN_COMPAT sed replacement because
# the regular expression used by hprefixify doesn't match here.
hprefixify steam
}
src_compile() {
:
}
src_install() {
dobin steam
insinto /usr/lib/steam/
doins bootstraplinux_ubuntu12_32.tar.xz
udev_dorules lib/udev/rules.d/99-steam-controller-perms.rules lib/udev/rules.d/60-HTC-Vive-perms.rules
dodoc debian/changelog steam_install_agreement.txt
doman steam.6
domenu steam.desktop
cd icons/ || die
for s in * ; do
doicon -s ${s} ${s}/steam.png
done
# tgz archive contains no separate pixmap, see #38
insinto /usr/share/pixmaps/
newins 48/steam_tray_mono.png steam_tray_mono.png
}
pkg_preinst() {
xdg_pkg_preinst
gnome2_icon_savelist
}
pkg_postinst() {
xdg_pkg_postinst
gnome2_icon_cache_update
udev_reload
elog "Execute ${EPREFIX}/usr/bin/steam to download and install the actual"
elog "client into your home folder. After installation, the script"
elog "also starts the client from your home folder."
elog ""
if use steamruntime; then
ewarn "You enabled the Steam runtime environment. Steam will use bundled"
ewarn "libraries instead of Gentoo's system libraries."
ewarn ""
else
elog "We disable STEAM_RUNTIME in order to ignore bundled libraries"
elog "and use installed system libraries instead. If you have problems,"
elog "try starting Steam with: STEAM_RUNTIME=1 steam"
ewarn ""
ewarn "Notice: Valve only supports Steam with the runtime enabled!"
ewarn ""
fi
if ! has_version "gnome-extra/zenity"; then
ewarn "Valve does not provide a xterm fallback for all calls of zenity."
ewarn "Please install gnome-extra/zenity for full support."
ewarn ""
fi
ewarn "The Steam client and the games are _not_ controlled by Portage."
ewarn "Updates are handled by the client itself."
}
pkg_postrm() {
xdg_pkg_postrm
gnome2_icon_cache_update
}

@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
@ -13,7 +12,7 @@ DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam clien
HOMEPAGE="http://steampowered.com"
SRC_URI="http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${PV}.tar.gz"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
LICENSE="ValveSteamLicense"
RESTRICT="bindist mirror"
@ -30,6 +29,7 @@ RDEPEND="
)
steamruntime? (
virtual/opengl[abi_x86_32]
x11-libs/libX11[abi_x86_32]
x11-libs/libXau[abi_x86_32]
x11-libs/libxcb[abi_x86_32]
@ -55,7 +55,6 @@ PATCHES=(
"${FILESDIR}"/steam-runtime-default.patch
"${FILESDIR}"/steam-set-distrib-release.patch
"${FILESDIR}"/steam-fix-joystick-detection.patch
"${FILESDIR}"/steam-fix-preload-libxcb.patch
)
pkg_setup() {
@ -77,17 +76,15 @@ src_prepare() {
default
sed -i 's:TAG+="uaccess":\0, TAG+="udev-acl":g' \
lib/udev/rules.d/99-steam-controller-perms.rules || die
lib/udev/rules.d/60-steam-input.rules || die
sed -i \
-e "s:@@DEBIAN_COMPAT@@:${EPREFIX}/usr/$(get_libdir)/debiancompat$(use amd64 && echo "\\:${EPREFIX}/usr/$(ABI=x86 get_libdir)/debiancompat"):g" \
-e "s:@@STEAM_RUNTIME@@:$(usex steamruntime 1 0):g" \
steam || die
# if STEAM_RUNTIME_PREFER_HOST_LIBRARIES is enabled, steam.sh wants to
# parse the output of ldconfig which is not in PATH for regular users
sed -i \
-e "s,export TEXTDOMAIN=steam,export TEXTDOMAIN=steam\nexport PATH=\${PATH}:/sbin/," steam || die
# use steam launcher version as release number as it is a bit more helpful than the baselayout version
sed -i -e "s,export DISTRIB_RELEASE=\"2.2\",export DISTRIB_RELEASE=\"${PVR}\"," steam || die
# Still need EPREFIX in the DEBIAN_COMPAT sed replacement because
# the regular expression used by hprefixify doesn't match here.
@ -104,9 +101,9 @@ src_install() {
insinto /usr/lib/steam/
doins bootstraplinux_ubuntu12_32.tar.xz
udev_dorules lib/udev/rules.d/99-steam-controller-perms.rules lib/udev/rules.d/60-HTC-Vive-perms.rules
udev_dorules lib/udev/rules.d/60-steam-input.rules lib/udev/rules.d/60-steam-vr.rules
dodoc debian/changelog steam_install_agreement.txt
dodoc debian/changelog steam_subscriber_agreement.txt
doman steam.6
domenu steam.desktop

@ -7,14 +7,6 @@
<text>\1/usr/bin/ssh</text>
<reg>^#?(cmd_du\s+).*$</reg>
<text>\1/usr/bin/du</text>
<reg>^(retain\s+)alpha\s+\d+.*$</reg>
<text>\1daily\t5</text>
<reg>^(retain\s+)beta\s+\d+.*$</reg>
<text>\1weekly\t4</text>
<reg>^(retain\s+)gamma\s+\d+.*$</reg>
<text>\1monthly\t3</text>
<reg>^#?retain\s+delta.*\n</reg>
<text></text>
<reg>^#?(rsync_short_args\s+).*$</reg>
<text>\1-aAX</text>
<reg>^#?(rsync_long_args\s+).*$</reg>

@ -1,27 +1,17 @@
- /container/*
- /dev
- /linux/*
- /dev/*
- /lost+found
- /lxc/*/calculate/packages
- /lxc/**/remote/distfiles
- /lxc/*/rootfs/proc
- /lxc/*/rootfs/run
- /lxc/*/rootfs/sys
- /lxc/*/rootfs/tmp
- /lxc/*/rootfs/usr/portage
- /lxc/*/rootfs/var/calculate/packages
- /lxc/*/rootfs/var/lib/layman
- /lxc/*/rootfs/var/log
- /tmp/*
- /usr/portage/*
- /var/lib/layman/*
- /lxc/*/snaps
- /lxc/*/rootfs/dev/*
- /lxc/*/rootfs/tmp/*
- /lxc/*/rootfs/usr/portage/*
- /lxc/*/rootfs/var/lib/layman/*
- /lxc/*/rootfs/var/log/*
- /lxc/**/calculate/packages
- /lxc/**/remote/distfiles
- /packages
- /proc
- /remote/distfiles
- /run
- /snapshots/*
- /sys
- /tmp
- /usr/portage/*
- /var/calculate/snapshots/*
- /var/lib/layman/*
- /var/log/*
- /vps/*

@ -1,65 +0,0 @@
# Calculate chmod=0755 path=/usr/libexec
#!/bin/bash
# Copyright (C) 2018 Mir Calculate Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# The script allows you to create daily, weekly (from Monday), and monthly
# (every 4 weeks) backups automatically, with a single daily startup.
weekseconds="$(( 60 * 60 * 24 * 7 ))"
get_value() {
awk -F"\t" "{if (\$1 == \"$1\") print \$2}" | tail -1
}
get_retain_value() {
awk -F"\t" "{if (\$1 == \"retain\" && \$2 == \"$1\") print \$3}" | tail -1
}
declare -A res
base_configfile=/etc/rsnapshot.conf
configfiles=${@:-$base_configfile}
for configfile in $configfiles
do
rsnapshot -c $configfile sync
res["$configfile"]=$?
done
for configfile in $configfiles
do
snapshot_root="$(cat $base_configfile $configfile | get_value snapshot_root)"
retain_daily="$(cat $base_configfile $configfile | get_retain_value daily)"
# calculating the day of the week when need to do rotation, so that a copy
# comes in weekly from Monday
if [[ $(date +"%w") -eq $(( ($retain_daily + 1) % 7 )) ]]
then
# it's time to make a monthly backup
if [[ $(( $(date +"%s") / $weekseconds % 4 )) -eq 0 ]]
then
rsnapshot -c $configfile monthly
fi
rsnapshot -c $configfile weekly
fi
# fix the backup as daily if there was no error
if [[ ${res["$configfile"]} -ne 1 ]]
then
rsnapshot -c $configfile daily
# write current time to backup for reference
date >${snapshot_root}/daily.0/timestamp
fi
done

@ -21,6 +21,7 @@ installkernel() {
install() {
inst_binary /usr/bin/cut
inst_binary /bin/grep
inst_script "$moddir/select-video.sh" "/sbin/select-video.sh"
inst_hook pre-pivot 50 "$moddir/system-video-blacklist.sh"
inst_hook cmdline 50 "$moddir/parse-cmdline.sh"

@ -1,5 +1,10 @@
#!/bin/bash
mount -o rw,remount ${NEWROOT} &>/dev/null
/sbin/select-video.sh ${NEWROOT}/etc/modprobe.d/video-blacklist.conf $videodrv
mount -o ro,remount ${NEWROOT} &>/dev/null
if mount | grep " /sysroot " | grep ro, &>/dev/null
then
mount -o rw,remount ${NEWROOT} &>/dev/null
/sbin/select-video.sh ${NEWROOT}/etc/modprobe.d/video-blacklist.conf $videodrv
mount -o ro,remount ${NEWROOT} &>/dev/null
else
/sbin/select-video.sh ${NEWROOT}/etc/modprobe.d/video-blacklist.conf $videodrv
fi

@ -44,3 +44,10 @@ Exec=env, "LXQT_SESSION_CONFIG=/", lxqt-leave
Comment=Sleep
Enabled=true
Exec=env, "LXQT_SESSION_CONFIG=/", lxqt-leave, --suspend
#?pkg(net-im/gajim)!=#
#
[Control%2Bgrave.-sum(pos,pos+1)-#]
Comment=Gajim show next pending event
Enabled=true
Exec=gajim-remote, show_next_pending_event
#pkg#

@ -0,0 +1,2 @@
# Calculate format=kernel name=.config
CONFIG_HFSPLUS_FS=m

@ -0,0 +1,2 @@
# Calculate format=kernel name=.config
CONFIG_HFSPLUS_FS=m

@ -2,4 +2,4 @@
[overlay-calculate]
# Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
remerge = 20181129
remerge = 20181130

@ -0,0 +1,4 @@
# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-kernel/dracut,app-backup/rsnapshot
[overlay-calculate]
remerge = #-cl_pass_file-#
Loading…
Cancel
Save