From 4bb200e9c0d07b49a199f865bd9b0cd66a818a1f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20H=C3=A4nsch?= Date: Wed, 6 Mar 2019 16:38:34 +0100 Subject: [PATCH] allow hooking of additional receipes --- Makefile | 62 +- config.example | 15 +- files/etc/timezone | 1 + files_xfce/etc/2.0/controllerrc | 40 + files_xfce/etc/2.0/gimprc | 11 + files_xfce/etc/2.0/gtkrc | 24 + files_xfce/etc/2.0/menurc | 1164 +++++++++++++++++ files_xfce/etc/2.0/sessionrc | 81 ++ files_xfce/etc/2.0/templaterc | 193 +++ files_xfce/etc/2.0/toolrc | 136 ++ files_xfce/etc/2.0/unitrc | 51 + files_xfce/etc/Xresources/xscreensaver | 4 + files_xfce/etc/Xsession.d/10qtstyle | 1 + {files => files_xfce}/etc/default/nodm | 0 files_xfce/etc/gtkrc | 1 + files_xfce/etc/marblerc | 9 + files_xfce/etc/mimeapps.list | 18 + files_xfce/etc/xfce4/panel/whiskermenu-1.rc | 1 + files_xfce/etc/xfce4/terminal/terminalrc | 3 + .../xfconf/xfce-perchannel-xml/thunar.xml | 5 + .../xfce-perchannel-xml/xfce4-desktop.xml | 12 + .../xfce-perchannel-xml/xfce4-panel.xml | 64 + .../xfconf/xfce-perchannel-xml/xfwm4.xml | 7 + .../xfconf/xfce-perchannel-xml/xsettings.xml | 46 + xfce.mk | 11 + 25 files changed, 1929 insertions(+), 31 deletions(-) create mode 100644 files/etc/timezone create mode 100644 files_xfce/etc/2.0/controllerrc create mode 100644 files_xfce/etc/2.0/gimprc create mode 100644 files_xfce/etc/2.0/gtkrc create mode 100644 files_xfce/etc/2.0/menurc create mode 100644 files_xfce/etc/2.0/sessionrc create mode 100644 files_xfce/etc/2.0/templaterc create mode 100644 files_xfce/etc/2.0/toolrc create mode 100644 files_xfce/etc/2.0/unitrc create mode 100644 files_xfce/etc/Xresources/xscreensaver create mode 100755 files_xfce/etc/Xsession.d/10qtstyle rename {files => files_xfce}/etc/default/nodm (100%) create mode 100644 files_xfce/etc/gtkrc create mode 100644 files_xfce/etc/marblerc create mode 100644 files_xfce/etc/mimeapps.list create mode 100644 files_xfce/etc/xfce4/panel/whiskermenu-1.rc create mode 100644 files_xfce/etc/xfce4/terminal/terminalrc create mode 100644 files_xfce/etc/xfce4/xfconf/xfce-perchannel-xml/thunar.xml create mode 100644 files_xfce/etc/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml create mode 100644 files_xfce/etc/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml create mode 100644 files_xfce/etc/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml create mode 100644 files_xfce/etc/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml create mode 100644 xfce.mk diff --git a/Makefile b/Makefile index 9487b5b..6a35118 100644 --- a/Makefile +++ b/Makefile @@ -24,17 +24,22 @@ deb http://raspbian.raspberrypi.org/raspbian stretch main non-free firmware rpi\ deb http://archive.raspberrypi.org/debian stretch main\n endef -PACKAGES := apt bluez bluez-firmware bluez-tools btrfs-tools busybox-static bzip2 ca-certificates cron debian-archive-keyring deborphan firmware-brcm80211 firmware-linux-free firmware-misc-nonfree gzip htop ifupdown init iputils-ping irqbalance isc-dhcp-client less libraspberrypi-bin libraspberrypi0 make net-tools nmap ntpdate openssh-client openssh-server pi-bluetooth raspberrypi-bootloader raspberrypi-kernel rsync ssh sshfs sudo systemd traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip xserver-xorg-video-fbturbo xserver-xorg nodm xauth x2x xfce4 xvkbd xfce4-terminal blueman +PACKAGES := apt bluez bluez-firmware bluez-tools btrfs-tools busybox-static bzip2 ca-certificates cron debian-archive-keyring deborphan firmware-brcm80211 firmware-linux-free firmware-misc-nonfree gzip htop ifupdown init iputils-ping irqbalance isc-dhcp-client less libraspberrypi-bin libraspberrypi0 make net-tools nmap ntpdate openssh-client openssh-server pi-bluetooth raspberrypi-bootloader raspberrypi-kernel rsync ssh sshfs sudo systemd traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip # Do not change, only override in config.mk WIFI-SSID = WIFI-PASS = -include config.mk - config.mk: config.example cp -n "$<" "$@" +.PHONY: imgfile imgmount root_copy norecommends apt_keys + +IMGFILE = raspi.img + +include config.mk +include *.mk + raspi_root: btrfs subvolume create "$@" || mkdir "$@" mkdir -p "$@/usr/bin" @@ -44,16 +49,19 @@ raspi_root: --arch=armhf --variant=minbase \ stretch "$@/" "${BOOTSTRAP}" +norecommends: raspi_root/etc/apt/apt.conf.d/10norecommends raspi_root/etc/apt/apt.conf.d/10norecommends: raspi_root mkdir -p "$"$@" chmod 644 "$@" -norecommends: raspi_root/etc/apt/apt.conf.d/10norecommends +apt_keys: + -chroot "$@" apt-key add - <./raspbian-archive-keyring.gpg + -chroot "$@" apt-key add - <./raspberrypi-archive-keyring.gpg + -chroot "$@" apt-key add - <./debian-archive-stretch-stable.gpg -raspi_root/: raspi_root norecommends .FORCE +raspi_root/: raspi_root norecommends apt_keys .FORCE printf '${SOURCES}' >$@/etc/apt/sources.list - -chroot "$@" apt-key add - <./*.gpg -cp /etc/resolv.conf "$@etc/" -chroot "$@" sh -c 'apt-mark showmanual |xargs apt-mark auto' -chroot "$@" apt-get update @@ -61,9 +69,6 @@ raspi_root/: raspi_root norecommends .FORCE chroot "$@" apt-get --yes install ${PACKAGES} chroot "$@" apt-get --yes --auto-remove purge chroot "$@" apt-get --yes --auto-remove upgrade - # chroot "$@" rpi-update || [ -f "$@/boot/bootcode.bin" ] - # -[ -d "$@/boot.bak/" ] && rm -r "$@/boot.bak/" - sync chroot "$@" apt-get clean chroot "$@" rm /usr/local/sbin/invoke-rc.d touch "$@" @@ -81,27 +86,32 @@ files/root/.ssh/authorized_keys: id_rsa.pub chmod 700 files/root/ files/root/.ssh/ chmod 600 '$@' -include *.mk +imgfile: raspi_root/ # do not set up image file before chroot +imgfile: partitions + dd bs=1M count=0 seek=1280 of="${IMGFILE}" # set up sparse file + sfdisk "${IMGFILE}" :::..." +# +# include "rc-file" +# +# style [= ] +# { +#