patchstack/customized main

local customizations

Patch does not have a description.
9 files changed+339 -3
  .gitignore
1
+ .ignore
1
  makefile
77
  mkosi.local.conf
30
  systemd
2
+ mkosi.profiles/custom/mkosi.postinst.d/wireshark.chroot
4
  mkosi.extra/usr/lib/tmpfiles.d/etc.conf
11
  mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf
1
+ mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf.d/gnome-xsession.conf
13
.gitignore+1
             @@ -12,3 +12,4 @@    12     12mkosi.packages/    13     13keys/    14     14mkosi.profiles/custom/mkosi.extra/usr/local/bin/           15versions/
.ignore+1
             @@ -0,0 +1,1 @@            1systemd/**
makefile+73 -4
             @@ -1,8 +1,77 @@     1       BINDIR := mkosi.profiles/custom/mkosi.extra/usr/local/bin     2            3       $(BINDIR)/btdu: $(MAKE_TMPDIR)/btdu            1BIN_DIR := mkosi.profiles/custom/mkosi.extra/usr/local/bin            2PACKAGES_DIR := mkosi.profiles/custom/mkosi.packages            3btdu := $(BIN_DIR)/btdu            4jj := $(BIN_DIR)/jj            5opensnitch := $(PACKAGES_DIR)/opensnitch.rpm            6opensnitch_ui := $(PACKAGES_DIR)/opensnitch_ui.rpm            7ALL := $(btdu) $(jj) $(opensnitch) $(opensnitch_ui)            8LATEST_VERSION = $(shell mkosi summary --json | jq -r '.Images[] | select(.Image == "main") | .ImageVersion')            9INSTALLED_VERSION = $(shell grep IMAGE_VERSION /etc/os-release | cut -d= -f2 | tr -d \")           10           11.PHONY: deps           12deps: $(PACKAGES_DIR) $(BIN_DIR) $(ALL)           13           14.PHONY: clean           15clean:           16	rm -fv $(ALL)           17           18$(BIN_DIR) $(PACKAGES_DIR):           19	mkdir -p $@           20           21$(jj): $(MAKE_TMPDIR)/jj.tar.gz           22	echo 9967a240e3294a0bce4444c55d40a35b70af44c69b558689aced95e4e497cef2 $(MAKE_TMPDIR)/jj.tar.gz | sha256sum --check           23	tar -xzf $(MAKE_TMPDIR)/jj.tar.gz -C $(MAKE_TMPDIR)           24	cp $(MAKE_TMPDIR)/jj $@           25           26$(MAKE_TMPDIR)/jj.tar.gz:           27	wget https://github.com/jj-vcs/jj/releases/download/v0.35.0/jj-v0.35.0-x86_64-unknown-linux-musl.tar.gz -O $(MAKE_TMPDIR)/jj.tar.gz           28           29$(btdu): $(MAKE_TMPDIR)/btdu     4     30	echo 35b9bb752e6aa902b8281e92a5411b2f1cfb9fa251089adf909dc95efc011c48 $(MAKE_TMPDIR)/btdu | sha256sum --check     5       	mv $(MAKE_TMPDIR)/btdu $@           31	cp $(MAKE_TMPDIR)/btdu $@     6     32     7     33$(MAKE_TMPDIR)/btdu:     8     34	wget https://github.com/CyberShadow/btdu/releases/download/v0.6.0/btdu-static-x86_64 -O $(MAKE_TMPDIR)/btdu           35           36$(opensnitch): $(MAKE_TMPDIR)/opensnitch.rpm           37	echo 2caf4e13ffd1b7af48306a2e9e979042f526823720b42bee4c00194f140d64dd $(MAKE_TMPDIR)/opensnitch.rpm | sha256sum --check           38	cp $(MAKE_TMPDIR)/opensnitch.rpm $@           39           40$(MAKE_TMPDIR)/opensnitch.rpm:           41		wget https://github.com/evilsocket/opensnitch/releases/download/v1.7.2/opensnitch-1.7.2-1.x86_64.rpm -O $(MAKE_TMPDIR)/opensnitch.rpm           42           43$(opensnitch_ui): $(MAKE_TMPDIR)/opensnitch_ui.rpm           44	echo b26029cbc83880ebc92170035d50237c13b17ffc0b3cf52b89fa1348edfdfb43 $(MAKE_TMPDIR)/opensnitch_ui.rpm | sha256sum --check           45	cp $(MAKE_TMPDIR)/opensnitch_ui.rpm $@           46           47$(MAKE_TMPDIR)/opensnitch_ui.rpm:           48	wget https://github.com/evilsocket/opensnitch/releases/download/v1.7.2/opensnitch-ui-1.7.2-1.noarch.rpm -O $(MAKE_TMPDIR)/opensnitch_ui.rpm           49           50mkosi.crt:           51	ln -s ~/Vaults/particleos_keys/sbctl/var/keys/db/db.pem mkosi.crt           52           53mkosi.key:           54	ln -s ~/Vaults/particleos_keys/sbctl/var/keys/db/db.key mkosi.key           55           56.PHONY: build           57build:           58	mkosi build --auto-bump           59           60.PHONY: systemd           61systemd:           62	sh -c 'cd systemd && mkosi -t none -f --distribution=fedora --release=43'           63           64.PHONY: sysupdate           65sysupdate:           66	mkosi sysupdate -- update           67	mkdir -p versions           68	cat mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.manifest | gzip > versions/$(LATEST_VERSION).manifest.gz           69	cat mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.changelog | gzip > versions/$(LATEST_VERSION).changelog.gz           70           71.PHONY: diff_changelog           72diff_changelog:           73	diff --color=always -u <(gzip --decompress --to-stdout versions/$(INSTALLED_VERSION).changelog.gz) mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.changelog           74           75.PHONY: diff_manifest           76diff_manifest:           77	diff --color=always -u <(gzip --decompress --to-stdout versions/$(INSTALLED_VERSION).manifest.gz) mkosi.output/ParticleOS_$(LATEST_VERSION)_x86-64.manifest
mkosi.local.conf+18 -12
             @@ -11,9 +11,15 @@    11     11[Config]    12     12Profiles=desktop,kde,custom    13     13           14[Output]           15ManifestFormat=changelog           16    14     17[Content]    15     18VolatilePackageDirectories=./systemd/build/mkosi.builddir/fedora~43~x86-64/    16     19Packages=           20        # keyrings for building other distro images           21        archlinux-keyring           22        debian-keyring    17     23        ansible    18     24        awk    19     25        bash             @@ -26,9 +32,11 @@    26     32        cowsay    27     33        cmatrix    28     34        curl    29               debian-keyring    30     35        dictd           36        diffoscope    31     37        du-dust           38        duf           39        d2    32     40        emacs    33     41        entr    34     42        exfatprogs             @@ -66,6 +74,9 @@    66     74        ImageMagick    67     75        iperf3    68     76        java-latest-openjdk           77        katago-opencl           78        intel-opencl           79        OpenCL-ICD-Loader    69     80        @kde-desktop    70     81        kde-connect    71     82        kde-partitionmanager             @@ -107,7 +118,9 @@   107    118        plasma-vault   108    119        pnpm   109    120        powertop          121        progress   110    122        proxychains-ng          123        pv   111    124        python3-netaddr   112    125        ripgrep   113    126        rubygem-asciidoctor             @@ -120,7 +133,7 @@   120    133        stgit   121    134        tcpdump   122    135        # not yet available for fedora 43   123               # terraform-ls          136        terraform-ls   124    137        tmux   125    138        toolbox   126    139        tor             @@ -136,15 +149,8 @@   136    149        wireshark   137    150        yubikey-manager   138    151        kernel   139               repository/opensnitch-ui-1.7.1-1.noarch.rpm   140               repository/opensnitch-1.7.1-1.x86_64.rpm          152        # repository directory comes from mkosi.packages          153        repository/opensnitch_ui.rpm          154        repository/opensnitch.rpm   141    155        python3-grpcio+protobuf   142    156        python3-slugify   143          144       [Validation]   145       SecureBootKey=./keys/sbctl/var/keys/db/db.key   146       SecureBootCertificate=./keys/sbctl/var/keys/db/db.pem   147       SignExpectedPcrKey=./keys/sbctl/var/keys/db/db.key   148       SignExpectedPcrCertificate=./keys/sbctl/var/keys/db/db.pem   149       VerityKey=./keys/sbctl/var/keys/db/db.key   150       VerityCertificate=./keys/sbctl/var/keys/db/db.pem
systemd+1 -1
             @@ -1,1 +1,1 @@     1       c2678480a79ad1fcab0b5c9a4c3195dbe0c490d1            153405835a2aa6e360863660f1e0e4d9a9688085f
mkosi.profiles/custom/mkosi.postinst.d/wireshark.chroot+4
             @@ -0,0 +1,4 @@            1#!/usr/bin/sh            2            3chmod 755 /usr/bin/dumpcap            4setcap -r /usr/bin/dumpcap
mkosi.extra/usr/lib/tmpfiles.d/etc.conf+9 -2
             @@ -3,6 +3,7 @@     3      3# This overrides the same file from systemd since we want to symlink everything     4      4# into /etc instead of copying so updates to /usr propagate properly.     5      5L /etc/os-release - - - - ../usr/lib/os-release            6L /etc/os-manifest - - - - ../usr/lib/os-manifest     6      7L+ /etc/mtab - - - - ../proc/self/mounts     7      8# Contains the default systemd locale     8      9L /etc/locale.conf             @@ -48,6 +49,8 @@    48     49L? /etc/tuned    49     50# Required by gdm    50     51L? /etc/gdm           52# Required by sdm           53L? /etc/sddm    51     54# Required by geoclue    52     55L? /etc/geoclue    53     56# Required by fwupd             @@ -65,10 +68,10 @@    65     68L? /etc/PackageKit    66     69# ModemManager needds its dbus policy file    67     70L? /etc/dbus1/systemd.d/org.freedesktop.ModemManager1.conf           71# man fails without this in /etc/           72L? /etc/manpath.config    68     73# Required by man-db-cache-update.service    69     74L? /etc/sysconfig/man-db    70       # sddm breaks otherwise, at least with homed?    71       L? /etc/sddm    72     75    73     76## custom    74     77C /etc/opensnitchd             @@ -93,6 +96,9 @@    93     96L? /etc/firejail    94     97L? /etc/login.defs    95     98           99# OpenCL          100L? /etc/OpenCL          101    96    102# abrtd    97    103L? /etc/libreport    98    104             @@ -104,3 +110,4 @@   104    110   105    111# miscellaneous legacy file   106    112L? /etc/shells          113L? /etc/hosts
mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf-1
             @@ -9,6 +9,5 @@     9      9        gnome-core    10     10        gnome-initial-setup    11     11        gnome-keyring-pkcs11    12               gnome-session-xsession    13     12        gnome-software-plugin-flatpak    14     13        gnome-software-plugin-fwupd
mkosi.profiles/gnome/mkosi.conf.d/debian/mkosi.conf.d/gnome-xsession.conf+13
             @@ -0,0 +1,13 @@            1# SPDX-License-Identifier: LGPL-2.1-or-later            2            3[TriggerMatch]            4Distribution=debian            5Release=trixie            6            7[TriggerMatch]            8Distribution=ubuntu            9Release=|oracular           10Release=|plucky           11           12[Content]           13Packages=gnome-session-xsession
jcgl updated patch to version 26
jcgl updated patch to version 25
jcgl updated patch to version 24
jcgl updated patch to version 23
jcgl updated patch to version 22
jcgl updated patch to version 21
jcgl updated patch to version 20
jcgl updated patch to version 19
jcgl updated patch to version 18
jcgl updated patch to version 17
jcgl updated patch to version 16
jcgl updated patch to version 15
jcgl updated patch to version 14
jcgl updated patch to version 13
jcgl updated patch to version 12
jcgl updated patch to version 11
jcgl updated patch to version 10
jcgl updated patch to version 9
jcgl updated patch to version 8
jcgl updated patch to version 7
jcgl updated patch to version 6
jcgl updated patch to version 5
jcgl updated patch to version 4
jcgl updated patch to version 3
jcgl updated patch to version 2
jcgl created patch version 1