From: Paul Hänsch <paul@plutz.net>
Date: Tue, 5 Mar 2019 08:30:51 +0000 (+0100)
Subject: package and apt configuration
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=bed6cddade88f1a7745a2e21eb92a922ab11a110;p=rpi_small

package and apt configuration
---

diff --git a/Makefile b/Makefile
index 26126d6..9487b5b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ 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 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 rpi-update rsync ssh sshfs sudo systemd traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip xserver-xorg-video-fbturbo xserver-xorg nodm xfce4 xvkbd xfce4-terminal
+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
 
 # Do not change, only override in config.mk
 WIFI-SSID = 
@@ -44,9 +44,16 @@ raspi_root:
 		--arch=armhf --variant=minbase \
 		stretch "$@/" "${BOOTSTRAP}"
 
-raspi_root/: raspi_root .FORCE
+raspi_root/etc/apt/apt.conf.d/10norecommends: raspi_root
+	mkdir -p "$</etc/apt/apt.conf.d/"
+	printf 'APT::Install-Recommends "false";\n' >"$@"
+	chmod 644 "$@"
+
+norecommends: raspi_root/etc/apt/apt.conf.d/10norecommends
+
+raspi_root/: raspi_root norecommends .FORCE
 	printf '${SOURCES}' >$@/etc/apt/sources.list
-	-chroot "$@" apt-key add - <./raspberrypi-archive-keyring.gpg
+	-chroot "$@" apt-key add - <./*.gpg
 	-cp /etc/resolv.conf "$@etc/"
 	-chroot "$@" sh -c 'apt-mark showmanual |xargs apt-mark auto'
 	-chroot "$@" apt-get update
@@ -54,8 +61,8 @@ raspi_root/: raspi_root .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/"
+	# 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
@@ -79,7 +86,7 @@ include *.mk
 raspi.img: raspi_root/ files/ partitions files/root/.ssh/authorized_keys files/etc/network/interfaces.d/wifi
 	-rmdir "$@.mnt"
 	mkdir "$@.mnt"  # fail receipe if dir is nonempty
-	dd bs=1M count=0 seek=3072 of="$@"  # set up sparse file
+	dd bs=1M count=0 seek=1280 of="$@"  # set up sparse file
 	sfdisk "$@" <partitions
 	lo=$$(losetup -f); image='$@'; \
 	start=$$(sfdisk --dump "$$image" |sed -rn 's;^.*start= *([0-9]+),.*type=83;\1;p'); \
diff --git a/debian-archive-stretch-stable.gpg b/debian-archive-stretch-stable.gpg
new file mode 100644
index 0000000..2c3f78f
Binary files /dev/null and b/debian-archive-stretch-stable.gpg differ
diff --git a/files/etc/apt/sources.list b/files/etc/apt/sources.list
new file mode 100644
index 0000000..a3638b4
--- /dev/null
+++ b/files/etc/apt/sources.list
@@ -0,0 +1,3 @@
+deb     http://raspbian.raspberrypi.org/raspbian stretch main non-free firmware rpi
+deb     http://archive.raspberrypi.org/debian stretch main
+