From e80e89c08dd9244b777cf8708498c42122c7a7a8 Mon Sep 17 00:00:00 2001 From: cyteen Date: Wed, 6 Nov 2024 15:19:07 +0000 Subject: [PATCH] Commit before push. --- 001_virtual-mem.sh | 15 +++++++++------ 010_apt-get.sh | 2 ++ 010_saltstack.sh | 28 +++++++++++++++++----------- 010_sysctl.sh | 8 +++----- 020_add-apt-repository.sh | 2 ++ 020_brave_browser-beta.sh | 31 ++++++++++++++++++++----------- 020_brave_browser-dev.sh | 3 ++- 020_brave_browser-nightly.sh | 11 ++++++----- 020_brave_browser.sh | 5 +++-- 020_gamma.sh | 2 +- 020_kicad-nightly.sh | 6 ++++-- 020_qucs-s.sh | 3 ++- 020_waterfox.sh | 3 ++- 020_zephyr.sh | 23 ++++++++++++----------- fix_add-repository_template.md | 16 ++++++++++++++++ 15 files changed, 101 insertions(+), 57 deletions(-) create mode 100644 020_add-apt-repository.sh create mode 100644 fix_add-repository_template.md diff --git a/001_virtual-mem.sh b/001_virtual-mem.sh index ac95219..9997799 100755 --- a/001_virtual-mem.sh +++ b/001_virtual-mem.sh @@ -1,9 +1,12 @@ #!/usr/bin/env bash +echo "Set in: 010_sysctl.sh" + # sysctl -w vm.max_map_count=262144 -if grep -q '^\(vm.max_map_count=\)' /etc/sysctl.conf -then - sed -i 's,^\(vm.max_map_count=\).*,\1'262144',' /etc/sysctl.conf -else - echo 'vm.max_map_count=262144' >> /etc/sysctl.conf -fi +# if grep -q '^\(vm.max_map_count=\)' /etc/sysctl.conf +# then +# sed -i 's,^\(vm.max_map_count=\).*,\1'262144',' /etc/sysctl.conf +# else +# echo 'vm.max_map_count=262144' >> /etc/sysctl.conf +# fi + diff --git a/010_apt-get.sh b/010_apt-get.sh index 4d91e3c..a8dbbc6 100755 --- a/010_apt-get.sh +++ b/010_apt-get.sh @@ -14,6 +14,8 @@ apt install -y autopsy apt install -y udisks2 apt install -y gddrescue apt install -y ddcutil +apt install -y drm-info +drm_info -j | jq 'with_entries(.value |= .driver.desc)'^' apt install -y xclip apt install -y bat apt install -y bc diff --git a/010_saltstack.sh b/010_saltstack.sh index 6011b0a..a67ccb4 100755 --- a/010_saltstack.sh +++ b/010_saltstack.sh @@ -14,32 +14,37 @@ #DEBIAN_VERSION=8 #DEBIAN_RELEASE=jessie -DEBIAN_VERSION=11 -DEBIAN_RELEASE=bullseye +#DEBIAN_VERSION=11 +#DEBIAN_RELEASE=bullseye ARCH="amd64" -# DEBIAN_VERSION=12 -# DEBIAN_RELEASE=bookworm +DEBIAN_VERSION=12 +DEBIAN_RELEASE=bookworm SALT_VERSION=latest -REFRESHED_AT=2023-11-06 +REFRESHED_AT=2024-09-09 mkdir -p /etc/apt/sources.list-available -# KEY_DIR="/etc/apt/trusted.gpg.d" # if you don't want to has signed-by in the sources.list -KEY_DIR="/etc/apt/keyrings" +KEY_DIR="/etc/apt/trusted.gpg.d" # if you don't want to have signed-by in the sources.list +# KEY_DIR="/etc/apt/keyrings" mkdir -p ${KEY_DIR} -sudo curl -fsSL -o ${KEY_DIR}/salt-archive-keyring.gpg https://repo.saltproject.io/py3/debian/${DEBIAN_VERSION}/${ARCH}/latest/salt-archive-keyring.gpg +# sudo curl -fsSL -o ${KEY_DIR}/salt-archive-keyring.gpg https://repo.saltproject.io/py3/debian/${DEBIAN_VERSION}/${ARCH}/latest/salt-archive-keyring.gpg +sudo curl -fsSL -o ${KEY_DIR}/salt-archive-keyring-2023.gpg https://repo.saltproject.io/salt/py3/debian/${DEBIAN_VERSION}/${ARCH}/SALT-PROJECT-GPG-PUBKEY-2023.gpg # NB Packages now have dh-systemd deps and --with-systemd treat as debian upstream echo "#sudo curl -fsSL -o ${KEY_DIR}/salt-archive-keyring.gpg https://repo.saltproject.io/py3/debian/${DEBIAN_VERSION}/${ARCH}/latest/salt-archive-keyring.gpg" | sudo tee /etc/apt/sources.list.d/salt.list -echo "deb [signed-by=${KEY_DIR}/salt-archive-keyring.gpg arch=${ARCH}] https://repo.saltproject.io/py3/debian/${DEBIAN_VERSION}/${ARCH}/latest ${DEBIAN_RELEASE} main" | sudo tee /etc/apt/sources.list.d/salt.list -#ln -s /etc/apt/sources.list-available/saltstack-${DEBIAN_RELEASE}.list /etc/apt/sources.list.d/saltstack-${DEBIAN_RELEASE}.list +# echo "deb [signed-by=${KEY_DIR}/salt-archive-keyring.gpg arch=${ARCH}] https://repo.saltproject.io/py3/debian/${DEBIAN_VERSION}/${ARCH}/latest ${DEBIAN_RELEASE} main" | sudo tee /etc/apt/sources.list.d/salt.list +echo "deb [signed-by=${KEY_DIR}/salt-archive-keyring-2023.gpg arch=${ARCH}] https://repo.saltproject.io/salt/py3/debian/${DEBIAN_VERSION}/${ARCH}/latest ${DEBIAN_RELEASE} main" | sudo tee /etc/apt/sources.list-available/saltstack-${DEBIAN_RELEASE}.list +ln -sf /etc/apt/sources.list-available/saltstack-${DEBIAN_RELEASE}.list /etc/apt/sources.list.d/saltstack-${DEBIAN_RELEASE}.list + + + # Upgrade The System apt update && apt -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade -y @@ -85,10 +90,11 @@ apt install -y salt-minion # Salt-master apt install -yq -o -o "Dpkg::Options::=--force-confold" --no-install-recommends \ salt-master \ - salt-api \ + salt-minion \ salt-ssh \ salt-syndic \ salt-cloud \ + salt-api \ reclass \ python-apt \ python-git \ diff --git a/010_sysctl.sh b/010_sysctl.sh index df0b07b..4872fa6 100755 --- a/010_sysctl.sh +++ b/010_sysctl.sh @@ -33,7 +33,7 @@ # vm.overcommit_ratio = 50 cat > /etc/sysctl.d/01-local.conf << 'EOF' -vm.max_map_count=262144 +vm.max_map_count=524288 vm.swappiness=10 vm.vfs_cache_pressure=50 @@ -44,13 +44,11 @@ vm.dirty_ratio=15 vm.overcommit_memory=2 vm.overcommit_ratio=25 - vfs.zfs.zfs_scan_legacy 0 - vfs.zfs.no_scrub_prefetch 1 EOF cat > /etc/sysctl.d/01-local-zfs.conf << 'EOF' -vfs.zfs.zfs_scan_legacy 0 -vfs.zfs.no_scrub_prefetch 1 +vfs.zfs.zfs_scan_legacy=0 +vfs.zfs.no_scrub_prefetch=1 EOF # run unprivileged containers on linux-hardened or their custom kernel diff --git a/020_add-apt-repository.sh b/020_add-apt-repository.sh new file mode 100644 index 0000000..b777ca5 --- /dev/null +++ b/020_add-apt-repository.sh @@ -0,0 +1,2 @@ +sudo apt install -y python3-apt python3-launchpadlib software-properties-common + diff --git a/020_brave_browser-beta.sh b/020_brave_browser-beta.sh index f7fd811..5459c80 100755 --- a/020_brave_browser-beta.sh +++ b/020_brave_browser-beta.sh @@ -2,13 +2,14 @@ machine=$(uname -m) if [[ ${machine} == x86_64 ]]; then - arch=amd64 + ARCH=amd64 elif [[ ${machine} == aarch64 ]]; then - arch=arm64 + ARCH=arm64 fi -UBUNTU_CODENAME=bionic +# UBUNTU_CODENAME=bionic +UBUNTU_CODENAME=stable BRANCH="-beta" URL="brave-browser-apt${BRANCH}.s3.brave.com" @@ -17,14 +18,23 @@ URL="brave-browser-apt${BRANCH}.s3.brave.com" KEY_DIR=/etc/apt/trusted.gpg.d # if you dont want to have signed-by in the sources.list # KEY_DIR=/usr/share/keyrings -KEY_DIR=/etc/apt/keyrings +# KEY_DIR=/etc/apt/keyrings +KEY=${KEY_DIR}/brave-browser${BRANCH}-archive-keyring.gpg +# KEY=${KEY_DIR}/brave-browser-keyring.gpg -sudo curl -fsSLo ${KEY_DIR}/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg +sudo curl -fsSLo ${KEY} https://brave-browser-apt-nightly.s3.brave.com/brave-browser${BRANCH}-archive-keyring.gpg + +## no data +# RECV_KEYS="C3DE1DD4F661CDCB" +# gpg --keyserver keyserver.ubuntu.com --recv-keys "${RECV_KEYS}" +# gpg --export --armor "${RECV_KEYS}" > ${KEY} -echo "deb [[signed-by=${KEY_DIR}/brave-browser-archive-keyring.gpg arch=${arch}] https://${URL}/ $UBUNTU_CODENAME main" | tee /etc/apt/sources.list-available/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list +cat <<-EOF | sudo tee /etc/apt/sources.list.d/brave-browser${BRANCH}.list + deb [arch=${ARCH} signed-by=${KEY}] https://${URL}/ $UBUNTU_CODENAME main +EOF -ln -s /etc/apt/sources.list-available/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list /etc/apt/sources.list.d/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list +ln -sf /etc/apt/sources.list-available/brave-browser${BRANCH}.list /etc/apt/sources.list.d/brave-browser${BRANCH}.list apt update @@ -35,10 +45,9 @@ echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf # Bypass apt-proxy for brave packages if [ -f /etc/apt/apt.conf.d/02proxy ]; then - cat /etc/apt/apt.conf.d/02proxy - if [ ! -z $(grep ${URL}) ]; then - echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy + if ! grep -q "${URL}" /etc/apt/apt.conf.d/02proxy; then + echo "Acquire::https::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy fi else - echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy + echo "Acquire::https::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy fi diff --git a/020_brave_browser-dev.sh b/020_brave_browser-dev.sh index 99a519a..572a597 100755 --- a/020_brave_browser-dev.sh +++ b/020_brave_browser-dev.sh @@ -8,7 +8,8 @@ elif arch=arm64 fi -UBUNTU_CODENAME=bionic +# UBUNTU_CODENAME=bionic +UBUNTU_CODENAME=stable BRANCH="-dev" URL=brave-browser-apt${BRANCH}.s3.brave.com diff --git a/020_brave_browser-nightly.sh b/020_brave_browser-nightly.sh index 00844f7..1275dc4 100755 --- a/020_brave_browser-nightly.sh +++ b/020_brave_browser-nightly.sh @@ -8,7 +8,8 @@ elif ARCH=arm64 fi -UBUNTU_CODENAME=bionic +# UBUNTU_CODENAME=bionic +UBUNTU_CODENAME=stable BRANCH="-nightly" URL="brave-browser-apt${BRANCH}.s3.brave.com" @@ -18,10 +19,10 @@ URL="brave-browser-apt${BRANCH}.s3.brave.com" KEY_DIR=/etc/apt/trusted.gpg.d # if you dont want to have signed-by in the sources.list # KEY_DIR=/usr/share/keyrings # KEY_DIR=/etc/apt/keyrings -KEY=${KEY_DIR}/brave-browser-archive-keyring.gpg +KEY=${KEY_DIR}/brave-browser${BRANCH}-archive-keyring.gpg # KEY=${KEY_DIR}/brave-browser-keyring.gpg -sudo curl -fsSLo ${KEY_DIR}/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg +sudo curl -fsSLo ${KEY} https://brave-browser-apt-nightly.s3.brave.com/brave-browser${BRANCH}-archive-keyring.gpg ## no data # RECV_KEYS="C3DE1DD4F661CDCB" @@ -29,11 +30,11 @@ sudo curl -fsSLo ${KEY_DIR}/brave-browser-archive-keyring.gpg https://brave-brow # gpg --export --armor "${RECV_KEYS}" > ${KEY} -cat <<-EOF | sudo tee /etc/apt/sources.list.d/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list +cat <<-EOF | sudo tee /etc/apt/sources.list.d/brave-browser${BRANCH}.list deb [arch=${ARCH} signed-by=${KEY}] https://${URL}/ $UBUNTU_CODENAME main EOF -ln -sf /etc/apt/sources.list-available/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list /etc/apt/sources.list.d/brave-browser${BRANCH}-${UBUNTU_CODENAME}.list +ln -sf /etc/apt/sources.list-available/brave-browser${BRANCH}.list /etc/apt/sources.list.d/brave-browser${BRANCH}.list apt update diff --git a/020_brave_browser.sh b/020_brave_browser.sh index ae1dc78..95efc7a 100755 --- a/020_brave_browser.sh +++ b/020_brave_browser.sh @@ -11,7 +11,8 @@ then arch=arm64 fi -UBUNTU_CODENAME=bionic +# UBUNTU_CODENAME=bionic +UBUNTU_CODENAME=stable URL="brave-browser-apt-release.s3.brave.com" KEY_URL="brave-browser-apt-release.s3.brave.com" KEY_DIR=/etc/apt/trusted.gpg.d @@ -23,7 +24,7 @@ KEY=${KEY_DIR}/${KEY_NAME} sudo curl -fsSLo ${KEY_DIR}/${KEY_NAME} https://${KEY_URL}/${KEY_NAME} -sudo echo "deb [signed-by=${KEY} arch=${arch}] https://${URL} ${UBUNTU_CODENAME} main" | tee /etc/apt/sources.list-available/brave-browser.list +sudo echo "deb [signed-by=${KEY} arch=${arch}] https://${URL} ${UBUNTU_CODENAME} main" | sudo tee /etc/apt/sources.list-available/brave-browser.list ln -sf /etc/apt/sources.list-available/brave-browser.list /etc/apt/sources.list.d/brave-browser.list diff --git a/020_gamma.sh b/020_gamma.sh index 2aaad04..5caa603 100644 --- a/020_gamma.sh +++ b/020_gamma.sh @@ -104,7 +104,7 @@ cat >./install.sh <<-EOF make libchibi-scheme.a SEXP_USE_DL=0 "CPPFLAGS=-DSEXP_USE_STATIC_LIBS -DSEXP_USE_STATIC_LIBS_NO_INCLUDE=0" popd - wget https://www.lua.org/ftp/lua-5.4.4.tar.gz + wget -c https://www.lua.org/ftp/lua-5.4.4.tar.gz tar -zxf lua-5.4.4.tar.gz pushd lua-5.4.4/src/ make CC=g++ liblua.a diff --git a/020_kicad-nightly.sh b/020_kicad-nightly.sh index ac2b4cc..68a2475 100644 --- a/020_kicad-nightly.sh +++ b/020_kicad-nightly.sh @@ -1,5 +1,6 @@ # https://forum.kicad.info/t/nightly-builds-for-debian-buster-and-bullseye/27487 -RELEASE=trixie +RELEASE=bookworm +#RELEASE=trixie #RELEASE=sid # rm /etc/apt/sources.list-available/kicad_nightly-buster.list /etc/apt/sources.list-available/kicad_nightly-bullseye.list # rm /etc/apt/sources.list-available/kicad_nightly-buster.list /etc/apt/sources.list-available/kicad_nightly-buster.list @@ -28,6 +29,7 @@ KEY=${KEY_DIR}/sur5r-keyring.gpg # KEYDATE="2021.02.17" # KEYDATE="2023.02.18" KEYDATE="2024.03.04" +VERSION="8.99" # /usr/lib/apt/apt-helper download-file https://debian.sur5r.net/i3/pool/main/s/sur5r-keyring/sur5r-keyring_2024.03.04_all.deb keyring.deb SHA256:f9bb4340b5ce0ded29b7e014ee9ce788006e9bbfe31e96c09b2118ab91fca734 # /usr/lib/apt/apt-helper download-file https://debian.sur5r.net/kicad-nightly/pool/main/s/sur5r-keyring/sur5r-keyring_2021.02.02_all.deb sur5r-keyring.deb SHA256:cccfb1dd7d6b1b6a137bb96ea5b5eef18a0a4a6df1d6c0c37832025d2edaa710 @@ -79,7 +81,7 @@ apt-get install \ ### /home/default/.local/share/kicad/5.99/scripting/plugins ### /home/default/.local/share/kicad/5.99/3rdparty/plugins # ~/.kicad_plugins/ -KICAD_SCRIPTS=${HOME}/.local/share/kicad/8.0/scripting/plugins/ +KICAD_SCRIPTS=${HOME}/.local/share/kicad/${VERSION}/scripting/plugins/ mkdir -p "${KICAD_SCRIPTS}" # Rounded tracks diff --git a/020_qucs-s.sh b/020_qucs-s.sh index e4821a0..6c64425 100755 --- a/020_qucs-s.sh +++ b/020_qucs-s.sh @@ -6,7 +6,8 @@ set -e #RELEASE_NAME=Debian_Testing #RELEASE_NAME=Debian_9.0 # stretch #RELEASE_NAME=Debian_10 # buster -RELEASE_NAME=Debian_11 # bullseye +#RELEASE_NAME=Debian_11 # bullseye +RELEASE_NAME=Debian_12 # bookworm SUSE_USER="ra3xdh" # KEY_DIR=/etc/apt/keyrings diff --git a/020_waterfox.sh b/020_waterfox.sh index 45ec014..b82b9dc 100755 --- a/020_waterfox.sh +++ b/020_waterfox.sh @@ -6,7 +6,8 @@ set -e #RELEASE_NAME=Debian_Testing #RELEASE_NAME=Debian_9.0 # stretch #RELEASE_NAME=Debian_10 # buster -RELEASE_NAME=Debian_11 # bullseye +#RELEASE_NAME=Debian_11 # bullseye +RELEASE_NAME=Debian_12 # bookworm diff --git a/020_zephyr.sh b/020_zephyr.sh index f86226e..69ba1d1 100644 --- a/020_zephyr.sh +++ b/020_zephyr.sh @@ -9,9 +9,9 @@ # west build -p always -b ${BOARD_NAME} samples/basic/blinky # Manual flash instructions https://github.com/seemoo-lab/openhaystack/wiki/Flashing-nRF-with-OpenOCD---ST-Link -# $ openocd \ -# -f ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${MACHINE}-pokysdk-linux/usr/share/openocd/scripts/interface/stlink.cfg \ -# -f ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${MACHINE}-pokysdk-linux/usr/share/openocd/scripts/target/nrf51.cfg +openocd \ + -f ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${MACHINE}-pokysdk-linux/usr/share/openocd/scripts/interface/stlink.cfg \ + -f ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${MACHINE}-pokysdk-linux/usr/share/openocd/scripts/target/nrf51.cfg # # $ telnet localhost 4444 # $ help @@ -33,14 +33,14 @@ # $ program /tmp/zephyr-shell_flash.bin verify # $ program /tmp/zephyr-shell_flash.bin # -# $ openocd \ -# -f ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${MACHINE}-pokysdk-linux/usr/share/openocd/scripts/interface/stlink.cfg \ -# -f ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${MACHINE}-pokysdk-linux/usr/share/openocd/scripts/target/nrf51.cfg -# -c init \ -# -c "reset halt" \ -# -c "nrf51 mass_erase" \ -# -c "program build/zephyr/zephyr.hex verify reset" \ -# -c exit +# openocd \ +# -f ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${MACHINE}-pokysdk-linux/usr/share/openocd/scripts/interface/stlink.cfg \ +# -f ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${MACHINE}-pokysdk-linux/usr/share/openocd/scripts/target/nrf51.cfg \ +# -c init \ +# -c "reset halt" \ +# -c "nrf51 mass_erase" \ +# -c "program build/zephyr/zephyr.hex verify reset" \ +# -c exit DEST=${1:-${HOME}} @@ -78,6 +78,7 @@ tar xvf ${SDK_FILENAME} ZEPHYR_ENV_FILE="${HOME}/.zshrc.d/001_zephyr.zsh" cat <<-EOF | tee ${ZEPHYR_ENV_FILE} # zephyr specific +export MACHINE=$(uname -m) export ZEPHYR_TOOLCHAIN_VARIANT=zephyr export ZEPHYR_SDK_INSTALL_DIR="${SDK_DEST}" diff --git a/fix_add-repository_template.md b/fix_add-repository_template.md new file mode 100644 index 0000000..67f8324 --- /dev/null +++ b/fix_add-repository_template.md @@ -0,0 +1,16 @@ +# [add ppa fails with unknown template error](https://askubuntu.com/questions/49040/apt-could-not-find-a-distribution-template-error) + +Error: could not find a distribution template for Devuan/excalibur ceres + + +python3-apt has the file /usr/lib/python3/dist-packages/aptsources/distro.p + + + +I solved it by hacking one python file, to pretend my distro is equal one previous: + +for template in self.sourceslist.matcher.templates: + if( template.name == 'Devuan/excalibur ceres'): # << added line + template.name = 'focal'; # << added line + if (self.is_codename(template.name) and... +