Minor modifications.

This commit is contained in:
cyteen 2020-10-10 18:47:41 +01:00
parent adaeca9e84
commit 8614161578
11 changed files with 41 additions and 38 deletions

View File

@ -61,23 +61,19 @@ EOF
cat > "/etc/apt/preferences.d/devuan.pref" << 'EOF'
Package: *
Pin: origin "auto.mirror.devian.org"
Pin: origin "deb.devuan.org"
Pin-Priority: 1001
Package: *
Pin: origin "packages.devuan.org"
Pin-Priority: 1001
Package: *
Pin: release a=jessie
Pin: release a=beowulf
Pin-Priority:800
Package: *
Pin: release a=jessie-backports
Pin: release a=beowulf-backports
Pin-Priority:750
Package: *
Pin: release a=ascii
Pin: release a=chimaera
Pin-Priority:100
Package: *

View File

@ -21,8 +21,8 @@ echo ${#ACTIVE_LIST[@]}
for RELEASE in "${ACTIVE_LIST[@]}"; do
echo "${RELEASE}"
bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<EOF
deb http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
deb-src http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
deb http://deb.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
deb-src http://deb.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
EOF
ln -sf "${AVAILABLE}"/devuan_"${RELEASE}".list "${ACTIVE}"/devuan_"${RELEASE}".list
done
@ -31,8 +31,8 @@ echo ${#INACTIVE_LIST[@]}
for RELEASE in "${INACTIVE_LIST[@]}"; do
echo "${RELEASE}"
bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<EOF
deb http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
deb-src http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
deb http://deb.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
deb-src http://deb.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
EOF
done
@ -40,8 +40,8 @@ echo ${#OTHER_LIST[@]}
for RELEASE in "${OTHER_LIST[@]}"; do
echo "${RELEASE}"
bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<EOF
deb http://pkgmaster.devuan.org/devuan ${RELEASE} main
deb-src http://pkgmaster.devuan.org/devuan ${RELEASE} main
deb http://deb.devuan.org/devuan ${RELEASE} main
deb-src http://deb.devuan.org/devuan ${RELEASE} main
EOF
done

View File

@ -66,7 +66,10 @@ apt install -y rox-filer
apt install -y atril
apt install -y pandoc
#apt install -y libreoffice-pdfimport
apt install -y terminology
update-alternatives --set x-terminal-emulator /usr/bin/terminology
apt install -y geeqie
apt install -y vbindiff
apt install -y wxhexeditor

View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash
ARDUINO_VERSION=1.8.5
ARDUINO_VERSION=1.8.13
#ARDUINO_VERSION=nightly
#ARDUINO_HOME=~/
ARDUINO_HOME=/opt

View File

@ -7,13 +7,16 @@ set -x
#echo "deb http://apt.dockerproject.org/repo debian-stretch main" >> /etc/apt/sources.list.d/docker.list
echo "#bash -c "curl -fsSL https://${URL}/linux/debian/gpg | apt-key add -"" > /etc/apt/sources.list-available/docker.list
echo "deb [arch=amd64] https://${URL}/linux/debian buster stable" >> /etc/apt/sources.list-available/docker.list
echo "deb https://${URL}/linux/debian buster stable" >> /etc/apt/sources.list-available/docker.list
ln -sf /etc/apt/sources.list-available/docker.list /etc/apt/sources.list.d/docker.list
#bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"
bash -c "curl -fsSL https://${URL}/linux/debian/gpg | apt-key add -"
bash -c "apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7EA0A9C3F273FCD8"
# Bypass apt-proxy for brave packages
if [ -d /etc/apt/apt.conf.d/02proxy ]; then
if [ ! -z $(grep ${URL}) ]; then

View File

@ -333,7 +333,7 @@ cd /usr/src
apt install devscripts
mk-build-deps free42-nologo --install --root-cmd sudo --remove
echo "deb-src http://pkgmaster.devuan.org/merged/ ceres main contrib non-free" >> /etc/apt/sources.list.d/ceres-temp.list
echo "deb-src http://deb.devuan.org/merged/ ceres main contrib non-free" >> /etc/apt/sources.list.d/ceres-temp.list
apt source free42-nologo
apt update
rm /etc/apt/sources.list.d/ceres-temp.list

View File

@ -18,6 +18,7 @@ cat > ~/.config/mpv/mpv.conf<< 'EOF'
#deband=no
#volume-max=100
#hwdec=vaapi
ytdl-format=bestvideo[height<=?640][fps<=?30][vcodec!=?vp9]+bestaudio/best
EOF
#
## Quality over performance

View File

@ -96,7 +96,7 @@ UBUNTU_SUITES=("xenial" "wily" "vivid" "utopic" "trusty")
# Mirrors to use. Update these to your preferred mirror.
DEBIAN_MIRROR="deb.debian.org"
UBUNTU_MIRROR="mirrors.kernel.org"
DEVUAN_MIRROR="pkgmaster.devuan.org"
DEVUAN_MIRROR="deb.devuan.org"
# Optionally set a default distribution if none is used. Note that you can set
# your own default (i.e. ${DIST:="unstable"}).
@ -182,6 +182,6 @@ EOF
chmod +x ${HOOK_DIR}/D06deps
#Update cow image on changes above
#DIST=${DIST} ARCH=${ARCH} git-pbuilder create --override-config --mirror http://pkgmaster.devuan.org
#DIST=${DIST} ARCH=${ARCH} git-pbuilder create --override-config --mirror http://deb.devuan.org
DIST=${DIST} ARCH=${ARCH} git-pbuilder create

View File

@ -26,9 +26,9 @@ apt update
# waterfox-current-kpe - Free, open and private browser with better integration with KDE
# waterfox-current-i18n-en-gb - English (British) language pack for Waterfox Current
apt install -y waterfox-classic-kpe waterfox-classic-i18n-en-gb
apt install -y waterfox-current-kpe waterfox-current-i18n-en-gb
update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/waterfox-classic 201
update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/waterfox-current 201
# Stop white flash background in dark theme mode.
# Add option toolkit.legacyUserProfileCustomizations.stylesheets to True.

View File

@ -4,7 +4,7 @@ LOGNAME=${USER}
RELEASE=$(awk -F '/' \{'print $1'\} < /etc/devuan_version | awk '$1=$1')
KEYRING=/usr/share/keyrings/devuan-archive-keyring.gpg
INCLUDE="eatmydata,ccache,gnupg,debhelper,autotools-dev"
MIRROR=http://pkgmaster.devuan.org/merged
MIRROR=http://deb.devuan.org/merged
apt install -y sbuild
mkdir -p /root/.gnupg # To work around #792100

View File

@ -5,8 +5,8 @@
cat > /etc/apt/sources.list.d/devuan-security.list <<EOD
# /etc/apt/sources.list.d/devuan-security.list
deb http://pkgmaster.devuan.org/merged jessie-security main
deb-src http://pkgmaster.devuan.org/merged jessie-security main
deb http://deb.devuan.org/merged jessie-security main
deb-src http://deb.devuan.org/merged jessie-security main
EOD
# Add stable updates for fast release packages (default: no)
@ -14,8 +14,8 @@
cat > /etc/apt/sources.list.d/devuan-stable-updates.list <<EOD
# /etc/apt/sources.list.d/devuan-stable-updates.list
deb http://pkgmaster.devuan.org/merged jessie-updates main
deb-src http://pkgmaster.devuan.org/merged jessie-updates main
deb http://deb.devuan.org/merged jessie-updates main
deb-src http://deb.devuan.org/merged jessie-updates main
EOD
# Add stable proposed updates (default: no)
@ -23,8 +23,8 @@
cat > /etc/apt/sources.list.d/devuan-stable-proposed-updates.list <<EOD
# /etc/apt/sources.list.d/devuan-stable-proposed-updates.list
deb http://pkgmaster.devuan.org/merged jessie-proposed main
deb-src http://pkgmaster.devuan.org/merged jessie-proposed main
deb http://deb.devuan.org/merged jessie-proposed main
deb-src http://deb.devuan.org/merged jessie-proposed main
EOD
# Add backports (default: no)
@ -32,8 +32,8 @@
cat > /etc/apt/sources.list.d/devuan-jessie-backports.list <<EOD
# /etc/apt/sources.list.d/devuan-jessie-backports.list
deb http://pkgmaster.devuan.org/merged jessie-backports main
deb-src http://pkgmaster.devuan.org/merged jessie-backports main
deb http://deb.devuan.org/merged jessie-backports main
deb-src http://deb.devuan.org/merged jessie-backports main
EOD
# Add experimental (default: no)
@ -41,8 +41,8 @@
cat > /etc/apt/sources.list.d/devuan-experimental.list <<EOD
# /etc/apt/sources.list.d/devuan-experimental.list
deb http://pkgmaster.devuan.org/devuan experimental main
deb-src http://pkgmaster.devuan.org/devuan experimental main
deb http://deb.devuan.org/devuan experimental main
deb-src http://deb.devuan.org/devuan experimental main
EOD
# Move to ascii (testing)
@ -50,20 +50,20 @@
cat > /etc/apt/sources.list.d/devuan-ascii.list <<EOD
# /etc/apt/sources.list.d/devuan-ascii.list
deb http://pkgmaster.devuan.org/merged ascii main
deb-src http://pkgmaster.devuan.org/merged ascii main
deb http://deb.devuan.org/merged ascii main
deb-src http://deb.devuan.org/merged ascii main
EOD
cat > /etc/apt/sources.list.d/devuan-ascii.list <<EOD
# /etc/apt/sources.list.d/devuan-ascii-updates.list
deb http://pkgmaster.devuan.org/merged ascii-updates main
deb-src http://pkgmaster.devuan.org/merged ascii-updates main
deb http://deb.devuan.org/merged ascii-updates main
deb-src http://deb.devuan.org/merged ascii-updates main
EOD
cat > /etc/apt/sources.list.d/devuan-ascii.list <<EOD
# /etc/apt/sources.list.d/devuan-ascii-security.list
deb http://pkgmaster.devuan.org/merged ascii-security main
deb-src http://pkgmaster.devuan.org/merged ascii-security main
deb http://deb.devuan.org/merged ascii-security main
deb-src http://deb.devuan.org/merged ascii-security main
EOD