From 1746e65953eb9ef9e0c4777804cf90f78dc4a216 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 18 Sep 2018 11:44:06 +0200 Subject: [PATCH] Reorganize minimal-manual file location. This also gets rid of the change to debian/rules --- debian/install | 1 + debian/rules | 2 +- live-build/auto/build | 2 +- live-build/auto/minimize-manual.py => minimize-manual | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename live-build/auto/minimize-manual.py => minimize-manual (100%) diff --git a/debian/install b/debian/install index 91d6ea37..4eb70070 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1,3 @@ live-build usr/share/livecd-rootfs get-ppa-fingerprint usr/share/livecd-rootfs +minimize-manual usr/share/livecd-rootfs diff --git a/debian/rules b/debian/rules index ed27747b..5e853009 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_test: dh_auto_test set -e; for x in live-build/auto/*; do \ - echo "$$x" | grep -q .py || sh -n "$$x"; \ + sh -n "$$x"; \ done override_dh_install: diff --git a/live-build/auto/build b/live-build/auto/build index cd738855..ec3d61bc 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -445,7 +445,7 @@ EOF (cd chroot && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr) echo END docdirs - /usr/share/livecd-rootfs/live-build/auto/minimize-manual.py chroot + /usr/share/livecd-rootfs/minimize-manual chroot lb binary "$@" touch binary.success diff --git a/live-build/auto/minimize-manual.py b/minimize-manual similarity index 100% rename from live-build/auto/minimize-manual.py rename to minimize-manual