[PATCH 1/4] cdrom: Cleanup everything after mastering

public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed

* [PATCH 1/4] cdrom: Cleanup everything after mastering
@ 2020-03-23 19:34 Michael Tremer
  2020-03-23 19:34 ` [PATCH 2/4] lfs: Drop quotes in DEPS variable Michael Tremer
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Michael Tremer @ 2020-03-23 19:34 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/cdrom | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lfs/cdrom b/lfs/cdrom
index f18b80a03..175a5aedc 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -255,6 +255,9 @@ endif
 	cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) \
 		-o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso .
 
+	# Cleanup everything
+	rm -rf $(DIR_TMP)/cdrom
+
 ifeq "$(HAS_ISOLINUX)" "1"
 	isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
 endif
-- 
2.20.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/4] lfs: Drop quotes in DEPS variable
  2020-03-23 19:34 [PATCH 1/4] cdrom: Cleanup everything after mastering Michael Tremer
@ 2020-03-23 19:34 ` Michael Tremer
  2020-03-23 19:34 ` [PATCH 3/4] Config: Refactor mastering packages Michael Tremer
  2020-03-23 19:34 ` [PATCH 4/4] core-updates: Ensure we have no temporary data in the package Michael Tremer
  2 siblings, 0 replies; 4+ messages in thread
From: Michael Tremer @ 2020-03-23 19:34 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 87742 bytes --]

Not sure why this has ever been there. This simply makes it
nicer to read and edit because we can have line-breaks now.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/7zip                       | 2 +-
 lfs/alac                       | 2 +-
 lfs/alsa                       | 2 +-
 lfs/amavisd                    | 2 +-
 lfs/amazon-ssm-agent           | 2 +-
 lfs/apache2                    | 2 +-
 lfs/apcupsd                    | 2 +-
 lfs/aprutil                    | 2 +-
 lfs/asterisk                   | 2 +-
 lfs/avahi                      | 2 +-
 lfs/aws-cli                    | 2 +-
 lfs/backup                     | 2 +-
 lfs/bacula                     | 2 +-
 lfs/bird                       | 2 +-
 lfs/borgbackup                 | 2 +-
 lfs/bwm-ng                     | 2 +-
 lfs/cifs-utils                 | 2 +-
 lfs/clamav                     | 2 +-
 lfs/client175                  | 2 +-
 lfs/collectd                   | 2 +-
 lfs/cpufrequtils               | 2 +-
 lfs/cups                       | 2 +-
 lfs/cups-filters               | 2 +-
 lfs/cyrus-sasl                 | 2 +-
 lfs/dbus                       | 2 +-
 lfs/ddrescue                   | 2 +-
 lfs/dehydrated                 | 2 +-
 lfs/dnsdist                    | 2 +-
 lfs/dpfhack                    | 2 +-
 lfs/ebtables                   | 2 +-
 lfs/elfutils                   | 2 +-
 lfs/elinks                     | 2 +-
 lfs/epson-inkjet-printer-escpr | 2 +-
 lfs/faad2                      | 2 +-
 lfs/fetchmail                  | 2 +-
 lfs/ffmpeg                     | 2 +-
 lfs/firmware-update            | 2 +-
 lfs/flac                       | 2 +-
 lfs/flashrom                   | 2 +-
 lfs/foomatic                   | 2 +-
 lfs/fping                      | 2 +-
 lfs/freefont                   | 2 +-
 lfs/freeradius                 | 2 +-
 lfs/frr                        | 2 +-
 lfs/ghostscript                | 2 +-
 lfs/git                        | 2 +-
 lfs/gnu-netcat                 | 2 +-
 lfs/gnump3d                    | 2 +-
 lfs/gpgme                      | 2 +-
 lfs/guardian                   | 2 +-
 lfs/gutenprint                 | 2 +-
 lfs/haproxy                    | 2 +-
 lfs/hostapd                    | 2 +-
 lfs/hplip                      | 2 +-
 lfs/htop                       | 2 +-
 lfs/icinga                     | 2 +-
 lfs/iftop                      | 2 +-
 lfs/igmpproxy                  | 2 +-
 lfs/intltool                   | 2 +-
 lfs/iotop                      | 2 +-
 lfs/iperf                      | 2 +-
 lfs/iperf3                     | 2 +-
 lfs/iptraf-ng                  | 2 +-
 lfs/ipvsadm                    | 2 +-
 lfs/joe                        | 2 +-
 lfs/keepalived                 | 2 +-
 lfs/krb5                       | 2 +-
 lfs/lame                       | 2 +-
 lfs/lcd4linux                  | 2 +-
 lfs/libassuan                  | 2 +-
 lfs/libdvbpsi                  | 2 +-
 lfs/libexif                    | 2 +-
 lfs/libid3tag                  | 2 +-
 lfs/libmad                     | 2 +-
 lfs/libmpdclient               | 2 +-
 lfs/libmpeg2                   | 2 +-
 lfs/libogg                     | 2 +-
 lfs/libpciaccess               | 2 +-
 lfs/libpri                     | 2 +-
 lfs/libseccomp                 | 2 +-
 lfs/libshout                   | 2 +-
 lfs/libsolv                    | 2 +-
 lfs/libsrtp                    | 2 +-
 lfs/libstatgrab                | 2 +-
 lfs/libtiff                    | 2 +-
 lfs/libtirpc                   | 2 +-
 lfs/libusbredir                | 2 +-
 lfs/libvirt                    | 2 +-
 lfs/libvorbis                  | 2 +-
 lfs/libyajl                    | 2 +-
 lfs/linux                      | 2 +-
 lfs/ltrace                     | 2 +-
 lfs/lynis                      | 2 +-
 lfs/make                       | 2 +-
 lfs/mc                         | 2 +-
 lfs/mcelog                     | 2 +-
 lfs/mdns-repeater              | 2 +-
 lfs/minicom                    | 2 +-
 lfs/minidlna                   | 2 +-
 lfs/monit                      | 2 +-
 lfs/motion                     | 2 +-
 lfs/mpc                        | 2 +-
 lfs/mpd                        | 2 +-
 lfs/mpfire                     | 2 +-
 lfs/mtr                        | 2 +-
 lfs/nagios-plugins             | 2 +-
 lfs/nagios_nrpe                | 2 +-
 lfs/nano                       | 2 +-
 lfs/ncat                       | 2 +-
 lfs/netpbm                     | 2 +-
 lfs/netsnmpd                   | 2 +-
 lfs/nfs                        | 2 +-
 lfs/nmap                       | 2 +-
 lfs/nut                        | 2 +-
 lfs/observium-agent            | 2 +-
 lfs/openldap                   | 2 +-
 lfs/openvmtools                | 2 +-
 lfs/opus                       | 2 +-
 lfs/pakfire3                   | 2 +-
 lfs/parted                     | 2 +-
 lfs/pcengines-apu-firmware     | 2 +-
 lfs/pcmciautils                | 2 +-
 lfs/perl-Authen-SASL           | 2 +-
 lfs/perl-Carp-Clan             | 2 +-
 lfs/perl-DBD-SQLite            | 2 +-
 lfs/perl-Date-Calc             | 2 +-
 lfs/perl-Date-Manip            | 2 +-
 lfs/perl-File-ReadBackwards    | 2 +-
 lfs/perl-File-Tail             | 2 +-
 lfs/perl-MIME-Base64           | 2 +-
 lfs/perl-Net-IP                | 2 +-
 lfs/perl-Net-LibIDN            | 2 +-
 lfs/perl-Net-SMTP-SSL          | 2 +-
 lfs/perl-TimeDate              | 2 +-
 lfs/perl-common-sense          | 2 +-
 lfs/perl-gettext               | 2 +-
 lfs/perl-inotify2              | 2 +-
 lfs/postfix                    | 2 +-
 lfs/powertop                   | 2 +-
 lfs/pycurl                     | 2 +-
 lfs/pygpgme                    | 2 +-
 lfs/python-clientform          | 2 +-
 lfs/python-distutils-extra     | 2 +-
 lfs/python-feedparser          | 2 +-
 lfs/python-lzma                | 2 +-
 lfs/python-m2crypto            | 2 +-
 lfs/python-mechanize           | 2 +-
 lfs/python-progressbar         | 2 +-
 lfs/python-pyparsing           | 2 +-
 lfs/python-rssdler             | 2 +-
 lfs/python-setuptools          | 2 +-
 lfs/python-six                 | 2 +-
 lfs/python-xattr               | 2 +-
 lfs/python3                    | 2 +-
 lfs/python3-botocore           | 2 +-
 lfs/python3-colorama           | 2 +-
 lfs/python3-dateutil           | 2 +-
 lfs/python3-docutils           | 2 +-
 lfs/python3-jmespath           | 2 +-
 lfs/python3-llfuse             | 2 +-
 lfs/python3-msgpack            | 2 +-
 lfs/python3-pyasn1             | 2 +-
 lfs/python3-rsa                | 2 +-
 lfs/python3-s3transfer         | 2 +-
 lfs/python3-setuptools         | 2 +-
 lfs/python3-setuptools-scm     | 2 +-
 lfs/python3-six                | 2 +-
 lfs/python3-yaml               | 2 +-
 lfs/qemu                       | 2 +-
 lfs/rpcbind                    | 2 +-
 lfs/rsync                      | 2 +-
 lfs/samba                      | 2 +-
 lfs/sane                       | 2 +-
 lfs/sarg                       | 2 +-
 lfs/sdl                        | 2 +-
 lfs/sendEmail                  | 2 +-
 lfs/shairport-sync             | 2 +-
 lfs/sox                        | 2 +-
 lfs/soxr                       | 2 +-
 lfs/spamassassin               | 2 +-
 lfs/spandsp                    | 2 +-
 lfs/spectre-meltdown-checker   | 2 +-
 lfs/speedtest-cli              | 2 +-
 lfs/spice                      | 2 +-
 lfs/spice-protocol             | 2 +-
 lfs/squid-accounting           | 2 +-
 lfs/squidclamav                | 2 +-
 lfs/sslh                       | 2 +-
 lfs/strace                     | 2 +-
 lfs/stress                     | 2 +-
 lfs/stunnel                    | 2 +-
 lfs/swatch                     | 2 +-
 lfs/sysbench                   | 2 +-
 lfs/taglib                     | 2 +-
 lfs/tcpdump                    | 2 +-
 lfs/telnet                     | 2 +-
 lfs/tftpd                      | 2 +-
 lfs/tmux                       | 2 +-
 lfs/tor                        | 2 +-
 lfs/traceroute                 | 2 +-
 lfs/transmission               | 2 +-
 lfs/tshark                     | 2 +-
 lfs/urlgrabber                 | 2 +-
 lfs/util-macros                | 2 +-
 lfs/vdr                        | 2 +-
 lfs/vdr_dvbapi                 | 2 +-
 lfs/vdr_eepg                   | 2 +-
 lfs/vdr_epgsearch              | 2 +-
 lfs/vdr_streamdev              | 2 +-
 lfs/vdradmin                   | 2 +-
 lfs/w_scan                     | 2 +-
 lfs/watchdog                   | 2 +-
 lfs/wavemon                    | 2 +-
 lfs/xvid                       | 2 +-
 lfs/zabbix_agentd              | 2 +-
 215 files changed, 215 insertions(+), 215 deletions(-)

diff --git a/lfs/7zip b/lfs/7zip
index 0c16a6f6f..d2f819256 100644
--- a/lfs/7zip
+++ b/lfs/7zip
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = 7zip
 PAK_VER    = 7
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/alac b/lfs/alac
index 18cce60e7..f8510294a 100644
--- a/lfs/alac
+++ b/lfs/alac
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = alac
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/alsa b/lfs/alsa
index 80293ce49..aee7915c1 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -38,7 +38,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = alsa
 PAK_VER    = 12
 
-DEPS       = ""
+DEPS       =
 
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
diff --git a/lfs/amavisd b/lfs/amavisd
index f87382e0e..43d3c6060 100644
--- a/lfs/amavisd
+++ b/lfs/amavisd
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = amavisd
 PAK_VER    = 3
 
-DEPS       = "clamav spamassassin perl-Net-LibIDN"
+DEPS       = clamav spamassassin perl-Net-LibIDN
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/amazon-ssm-agent b/lfs/amazon-ssm-agent
index a41dc08bb..44a91f4ac 100644
--- a/lfs/amazon-ssm-agent
+++ b/lfs/amazon-ssm-agent
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = amazon-ssm-agent
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 DIR_BUILD  = $(GOPATH)/src/github.com/aws/amazon-ssm-agent
 
diff --git a/lfs/apache2 b/lfs/apache2
index b00ac9e64..532abcd3a 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-DEPS       = "aprutil pcre"
+DEPS       = aprutil pcre
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/apcupsd b/lfs/apcupsd
index e9766bb57..22818eda5 100644
--- a/lfs/apcupsd
+++ b/lfs/apcupsd
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = apcupsd
 PAK_VER    = 6
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/aprutil b/lfs/aprutil
index 3bd0861dc..9e52212d3 100644
--- a/lfs/aprutil
+++ b/lfs/aprutil
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-DEPS       = "apr"
+DEPS       = apr
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/asterisk b/lfs/asterisk
index ab038eb13..77667e232 100755
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -30,7 +30,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
 PAK_VER    = 26
 
-DEPS       = "libsrtp opus"
+DEPS       = libsrtp opus
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/avahi b/lfs/avahi
index 26508adbe..41357f644 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
 PROG       = avahi
 PAK_VER    = 5
 
-DEPS	   = "dbus libdaemon"
+DEPS       = dbus libdaemon
 
 CFLAGS    += -U_FORTIFY_SOURCE
 
diff --git a/lfs/aws-cli b/lfs/aws-cli
index f6cdda12f..45e8f2a95 100644
--- a/lfs/aws-cli
+++ b/lfs/aws-cli
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = aws-cli
 PAK_VER    = 2
 
-DEPS       = "python3-botocore python3-colorama python3-docutils python3-pyasn1 python3-rsa python3-s3transfer python3-yaml"
+DEPS       = python3-botocore python3-colorama python3-docutils python3-pyasn1 python3-rsa python3-s3transfer python3-yaml
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/backup b/lfs/backup
index b8b841bcb..791d87adb 100644
--- a/lfs/backup
+++ b/lfs/backup
@@ -32,7 +32,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = backup
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/bacula b/lfs/bacula
index bef221b6a..8c96c7ba1 100644
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bacula
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/bird b/lfs/bird
index 191f2ac04..e1bf19bb2 100644
--- a/lfs/bird
+++ b/lfs/bird
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bird
 PAK_VER    = 6
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/borgbackup b/lfs/borgbackup
index 50c9a78cb..97efd970d 100644
--- a/lfs/borgbackup
+++ b/lfs/borgbackup
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = borgbackup
 PAK_VER    = 3
 
-DEPS       = "python3-llfuse python3-msgpack"
+DEPS       = python3-llfuse python3-msgpack
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/bwm-ng b/lfs/bwm-ng
index b9851f7ad..d92a02925 100644
--- a/lfs/bwm-ng
+++ b/lfs/bwm-ng
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bwm-ng
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/cifs-utils b/lfs/cifs-utils
index 7462edb53..7502cb021 100644
--- a/lfs/cifs-utils
+++ b/lfs/cifs-utils
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cifs-utils
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/clamav b/lfs/clamav
index debba0a7e..be6f5155d 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
 PAK_VER    = 49
 
-DEPS       = ""
+DEPS       =
 
 ifeq "$(BUILD_PLATFORM)" "arm"
 CONFIGURE_FLAGS = --disable-fanotify
diff --git a/lfs/client175 b/lfs/client175
index 05c8fc5dd..e69e8e705 100644
--- a/lfs/client175
+++ b/lfs/client175
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = client175
 PAK_VER    = 3
 
-DEPS       = "mpfire"
+DEPS       = mpfire
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/collectd b/lfs/collectd
index e31324817..ad780f50d 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = collectd
 
-DEPS       = ""
+DEPS       =
 
 CFLAGS    += -Wno-error=deprecated-declarations
 
diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils
index e8e627ff7..2eb8616d5 100644
--- a/lfs/cpufrequtils
+++ b/lfs/cpufrequtils
@@ -35,7 +35,7 @@ SUP_ARCH   = x86_64 i586
 PROG       = cpufrequtils
 PAK_VER    = 9
 
-DEPS       = ""
+DEPS       =
 
 CFLAGS    += -fno-PIC
 
diff --git a/lfs/cups b/lfs/cups
index 2a564ccaa..d5601a576 100644
--- a/lfs/cups
+++ b/lfs/cups
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups
 PAK_VER    = 19
 
-DEPS       = "avahi cups-filters dbus ghostscript krb5 libtiff"
+DEPS       = avahi cups-filters dbus ghostscript krb5 libtiff
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/cups-filters b/lfs/cups-filters
index 859983367..8acd557af 100644
--- a/lfs/cups-filters
+++ b/lfs/cups-filters
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = cups-filters
 PAK_VER    = 2
 
-DEPS       = "cups ghostscript"
+DEPS       = cups ghostscript
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index ce1941e4a..7f5135612 100644
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -39,7 +39,7 @@ else
 	TARGET     = $(DIR_INFO)/$(THISAPP)-ldap
 endif
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/dbus b/lfs/dbus
index 9936c875a..f1fbdade4 100644
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = dbus
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/ddrescue b/lfs/ddrescue
index 5d08085fa..f30a5edb5 100644
--- a/lfs/ddrescue
+++ b/lfs/ddrescue
@@ -33,7 +33,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ddrescue
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/dehydrated b/lfs/dehydrated
index fc82f270d..34b938c13 100644
--- a/lfs/dehydrated
+++ b/lfs/dehydrated
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = dehydrated
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/dnsdist b/lfs/dnsdist
index 30eba4673..9f2040f16 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -35,7 +35,7 @@ SUP_ARCH   = x86_64 i586
 PROG       = dnsdist
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 2048)))
 
diff --git a/lfs/dpfhack b/lfs/dpfhack
index e95db8588..4d1c158c6 100644
--- a/lfs/dpfhack
+++ b/lfs/dpfhack
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = dpfhack
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/ebtables b/lfs/ebtables
index 250a04fdf..ba94d686a 100644
--- a/lfs/ebtables
+++ b/lfs/ebtables
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ebtables
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/elfutils b/lfs/elfutils
index f72d11531..3170d9b1e 100644
--- a/lfs/elfutils
+++ b/lfs/elfutils
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = elfutils
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/elinks b/lfs/elinks
index d6ec0875c..7dd0333dc 100644
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = elinks
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/epson-inkjet-printer-escpr b/lfs/epson-inkjet-printer-escpr
index 9bce8abc8..3a0f84c50 100644
--- a/lfs/epson-inkjet-printer-escpr
+++ b/lfs/epson-inkjet-printer-escpr
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = epson-inkjet-printer-escpr
 PAK_VER    = 2
 
-DEPS       = "cups"
+DEPS       = cups
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/faad2 b/lfs/faad2
index ecf7f8a62..79f913164 100644
--- a/lfs/faad2
+++ b/lfs/faad2
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = faad2
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/fetchmail b/lfs/fetchmail
index a26baece7..cde51fadb 100644
--- a/lfs/fetchmail
+++ b/lfs/fetchmail
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = fetchmail
 PAK_VER    = 9
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index b8b0df4ef..3e705c2d5 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ffmpeg
 PAK_VER    = 8
 
-DEPS       = "sdl lame libvorbis xvid"
+DEPS       = sdl lame libvorbis xvid
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/firmware-update b/lfs/firmware-update
index 53e8f039f..2fe4622db 100644
--- a/lfs/firmware-update
+++ b/lfs/firmware-update
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = firmware-update
 PAK_VER    = 1
 
-DEPS       = "flashrom"
+DEPS       = flashrom
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/flac b/lfs/flac
index f54326be7..0e967afa2 100644
--- a/lfs/flac
+++ b/lfs/flac
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = flac
 PAK_VER    = 2
 
-DEPS       = "libogg"
+DEPS       = libogg
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/flashrom b/lfs/flashrom
index 5d1753591..d3ae0a487 100644
--- a/lfs/flashrom
+++ b/lfs/flashrom
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = flashrom
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/foomatic b/lfs/foomatic
index 884ca3d77..1b50dd85c 100644
--- a/lfs/foomatic
+++ b/lfs/foomatic
@@ -37,7 +37,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = foomatic
 PAK_VER    = 4
 
-DEPS       = "cups ghostscript libtiff hplip"
+DEPS       = cups ghostscript libtiff hplip
 
 export LIB_CUPS=/usr/lib/cups
 export CUPS_BACKENDS=/usr/lib/cups/backends
diff --git a/lfs/fping b/lfs/fping
index f82c28b67..79850e5bd 100644
--- a/lfs/fping
+++ b/lfs/fping
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = fping
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/freefont b/lfs/freefont
index d70273626..d9b19e1ed 100644
--- a/lfs/freefont
+++ b/lfs/freefont
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = freefont
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/freeradius b/lfs/freeradius
index 1417f422d..3453d8e4d 100644
--- a/lfs/freeradius
+++ b/lfs/freeradius
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = freeradius
 PAK_VER    = 10
 
-DEPS       = "samba"
+DEPS       = samba
 
 ifeq "$(BUILD_ARCH)" "armv5tel"
 	LDFLAGS += -latomic
diff --git a/lfs/frr b/lfs/frr
index a14dc5981..8030dc817 100644
--- a/lfs/frr
+++ b/lfs/frr
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = frr
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/ghostscript b/lfs/ghostscript
index 5757879ba..f1dc55864 100644
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ghostscript
 PAK_VER    = 4
 
-DEPS       = "cups dbus libtiff"
+DEPS       = cups dbus libtiff
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/git b/lfs/git
index fa5cc8062..86ba8d98d 100644
--- a/lfs/git
+++ b/lfs/git
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
 PAK_VER    = 16
 
-DEPS       = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL"
+DEPS       = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/gnu-netcat b/lfs/gnu-netcat
index de758d063..2e8c10aa1 100644
--- a/lfs/gnu-netcat
+++ b/lfs/gnu-netcat
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = gnu-netcat
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/gnump3d b/lfs/gnump3d
index 7ae697ae3..75df7eba5 100644
--- a/lfs/gnump3d
+++ b/lfs/gnump3d
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = gnump3d
 PAK_VER    = 6
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/gpgme b/lfs/gpgme
index 6a8a84da3..d9890804a 100644
--- a/lfs/gpgme
+++ b/lfs/gpgme
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = gpgme
 PAK_VER    = 2
 
-DEPS       = "libassuan"
+DEPS       = libassuan
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/guardian b/lfs/guardian
index 3e2c3347f..85712a0fa 100644
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = guardian
 PAK_VER    = 19
 
-DEPS       = "perl-inotify2 perl-Net-IP"
+DEPS       = perl-inotify2 perl-Net-IP
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/gutenprint b/lfs/gutenprint
index 0a18aa73b..6c2626d26 100644
--- a/lfs/gutenprint
+++ b/lfs/gutenprint
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = gutenprint
 PAK_VER    = 3
 
-DEPS       = "cups"
+DEPS       = cups
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/haproxy b/lfs/haproxy
index fadb084bd..d326a090a 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
 PAK_VER    = 13
 
-DEPS       = ""
+DEPS       =
 
 ifeq "$(BUILD_ARCH)" "armv5tel"
 	LDFLAGS += -latomic
diff --git a/lfs/hostapd b/lfs/hostapd
index 382482230..168b08d40 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
 PAK_VER    = 50
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/hplip b/lfs/hplip
index b9d4e696f..8b16f1eb4 100644
--- a/lfs/hplip
+++ b/lfs/hplip
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hplip
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/htop b/lfs/htop
index 37f04aa63..9bb951fad 100644
--- a/lfs/htop
+++ b/lfs/htop
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = htop
 PAK_VER    = 12
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/icinga b/lfs/icinga
index 08f607af4..7fdba401b 100644
--- a/lfs/icinga
+++ b/lfs/icinga
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = icinga
 PAK_VER    = 3
 
-DEPS       = "nagios-plugins"
+DEPS       = nagios-plugins
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/iftop b/lfs/iftop
index 18ba5caae..2048fcfc8 100644
--- a/lfs/iftop
+++ b/lfs/iftop
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = iftop
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/igmpproxy b/lfs/igmpproxy
index e1a1ae08e..c32d519b9 100644
--- a/lfs/igmpproxy
+++ b/lfs/igmpproxy
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = igmpproxy
 PAK_VER    = 5
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/intltool b/lfs/intltool
index 32386900d..234262f62 100644
--- a/lfs/intltool
+++ b/lfs/intltool
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = intltool
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/iotop b/lfs/iotop
index 325b766d3..d286eb1a9 100644
--- a/lfs/iotop
+++ b/lfs/iotop
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = iotop
 PAK_VER    = 1
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/iperf b/lfs/iperf
index aaace823f..4614fba3e 100644
--- a/lfs/iperf
+++ b/lfs/iperf
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = iperf
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/iperf3 b/lfs/iperf3
index 842d48cec..69b1ed14a 100644
--- a/lfs/iperf3
+++ b/lfs/iperf3
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = iperf3
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/iptraf-ng b/lfs/iptraf-ng
index afb82ea67..3d1c4b61a 100644
--- a/lfs/iptraf-ng
+++ b/lfs/iptraf-ng
@@ -19,7 +19,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = iptraf-ng
 PAK_VER	   = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/ipvsadm b/lfs/ipvsadm
index 6345237f0..1f1026131 100644
--- a/lfs/ipvsadm
+++ b/lfs/ipvsadm
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipvsadm
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/joe b/lfs/joe
index 3c577ac47..70e8d735b 100644
--- a/lfs/joe
+++ b/lfs/joe
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = joe
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/keepalived b/lfs/keepalived
index 905f1d070..505537e60 100644
--- a/lfs/keepalived
+++ b/lfs/keepalived
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = keepalived
 PAK_VER    = 8
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/krb5 b/lfs/krb5
index 5a619ab84..4ab342c01 100644
--- a/lfs/krb5
+++ b/lfs/krb5
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = krb5
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/lame b/lfs/lame
index a8c3101ad..9e0bee915 100644
--- a/lfs/lame
+++ b/lfs/lame
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lame
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/lcd4linux b/lfs/lcd4linux
index 052c905c3..198607e25 100644
--- a/lfs/lcd4linux
+++ b/lfs/lcd4linux
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = lcd4linux
 PAK_VER    = 6
 
-DEPS       = "dpfhack libmpdclient"
+DEPS       = dpfhack libmpdclient
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libassuan b/lfs/libassuan
index 3a2439f43..78703e383 100644
--- a/lfs/libassuan
+++ b/lfs/libassuan
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libassuan
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libdvbpsi b/lfs/libdvbpsi
index c7f5ac717..1a7e17329 100644
--- a/lfs/libdvbpsi
+++ b/lfs/libdvbpsi
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libdvbpsi
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libexif b/lfs/libexif
index 5861e2f47..9b3f40f49 100644
--- a/lfs/libexif
+++ b/lfs/libexif
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libexif
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libid3tag b/lfs/libid3tag
index ccfecc71c..8c61c5157 100644
--- a/lfs/libid3tag
+++ b/lfs/libid3tag
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libid3tag
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libmad b/lfs/libmad
index f197d37d4..99a20f0a1 100644
--- a/lfs/libmad
+++ b/lfs/libmad
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libmad
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 CFLAGS    += -Wa,--noexecstack
 
diff --git a/lfs/libmpdclient b/lfs/libmpdclient
index 7a4ce2955..e35ea9ee6 100644
--- a/lfs/libmpdclient
+++ b/lfs/libmpdclient
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libmpdclient
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libmpeg2 b/lfs/libmpeg2
index ada8864a1..364cff1a8 100644
--- a/lfs/libmpeg2
+++ b/lfs/libmpeg2
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libmpeg2
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libogg b/lfs/libogg
index dee758d53..49ca0185a 100644
--- a/lfs/libogg
+++ b/lfs/libogg
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libogg
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libpciaccess b/lfs/libpciaccess
index dd109220c..707722362 100644
--- a/lfs/libpciaccess
+++ b/lfs/libpciaccess
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libpciaccess
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libpri b/lfs/libpri
index cc09c1b43..c748c5647 100644
--- a/lfs/libpri
+++ b/lfs/libpri
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libpri
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libseccomp b/lfs/libseccomp
index 4d1e4a3d8..064fb5896 100644
--- a/lfs/libseccomp
+++ b/lfs/libseccomp
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libseccomp
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libshout b/lfs/libshout
index bfba34235..f2b6c9af7 100644
--- a/lfs/libshout
+++ b/lfs/libshout
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libshout
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libsolv b/lfs/libsolv
index 3cad11da7..1f79ce700 100644
--- a/lfs/libsolv
+++ b/lfs/libsolv
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = libsolv
-DEPS       = ""
+DEPS       =
 PAK_VER    = 2
 
 ###############################################################################
diff --git a/lfs/libsrtp b/lfs/libsrtp
index a13dcb09d..25508f863 100644
--- a/lfs/libsrtp
+++ b/lfs/libsrtp
@@ -33,7 +33,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libsrtp
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libstatgrab b/lfs/libstatgrab
index 471ba3ab6..71721355a 100644
--- a/lfs/libstatgrab
+++ b/lfs/libstatgrab
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libstatgrab
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libtiff b/lfs/libtiff
index 3025c45e4..0e4e0e5d0 100644
--- a/lfs/libtiff
+++ b/lfs/libtiff
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libtiff
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libtirpc b/lfs/libtirpc
index fbe35491b..92c38e82a 100644
--- a/lfs/libtirpc
+++ b/lfs/libtirpc
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libtirpc
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libusbredir b/lfs/libusbredir
index 6df051a8f..ab221eeda 100644
--- a/lfs/libusbredir
+++ b/lfs/libusbredir
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libusbredir
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libvirt b/lfs/libvirt
index fdf6fcdcf..0d44b2bef 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -35,7 +35,7 @@ SUP_ARCH   = i586 x86_64
 PROG       = libvirt
 PAK_VER    = 20
 
-DEPS       = "libpciaccess libyajl ncat qemu"
+DEPS       = libpciaccess libyajl ncat qemu
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libvorbis b/lfs/libvorbis
index c61cbffe7..4b0a6adf1 100644
--- a/lfs/libvorbis
+++ b/lfs/libvorbis
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libvorbis
 PAK_VER    = 4
 
-DEPS       = "libogg"
+DEPS       = libogg
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/libyajl b/lfs/libyajl
index 703f7f21d..1cbdc89c7 100644
--- a/lfs/libyajl
+++ b/lfs/libyajl
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libyajl
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/linux b/lfs/linux
index 4d24752e3..3651e120c 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -35,7 +35,7 @@ CFLAGS     =
 CXXFLAGS   =
 
 PAK_VER    = 94
-DEPS	   = ""
+DEPS	   =
 
 HEADERS_ARCH  = $(BUILD_PLATFORM)
 KERNEL_ARCH   = $(BUILD_ARCH)
diff --git a/lfs/ltrace b/lfs/ltrace
index 1ac7981ea..bcab77082 100644
--- a/lfs/ltrace
+++ b/lfs/ltrace
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ltrace
 PAK_VER    = 2
 
-DEPS       = "elfutils"
+DEPS       = elfutils
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/lynis b/lfs/lynis
index f1e4f7211..9c756d34a 100644
--- a/lfs/lynis
+++ b/lfs/lynis
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = lynis
 PAK_VER    = 6
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/make b/lfs/make
index d93da3d98..411a1b008 100644
--- a/lfs/make
+++ b/lfs/make
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = make
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 # Normal build or $(TOOLS_DIR) build.
 #
diff --git a/lfs/mc b/lfs/mc
index 528cb4d4a..8edba6df8 100644
--- a/lfs/mc
+++ b/lfs/mc
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mc
 PAK_VER    = 19
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/mcelog b/lfs/mcelog
index 871c0d76b..045a5a2a1 100644
--- a/lfs/mcelog
+++ b/lfs/mcelog
@@ -35,7 +35,7 @@ PROG       = mcelog
 PAK_VER    = 1
 SUP_ARCH   = i586 x86_64
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/mdns-repeater b/lfs/mdns-repeater
index 2166df1ed..afe4bfc18 100644
--- a/lfs/mdns-repeater
+++ b/lfs/mdns-repeater
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mdns-repeater
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 CFLAGS    += -DHGVERSION='\"$(VER)\"'
 
diff --git a/lfs/minicom b/lfs/minicom
index 6a92881a4..5a233325a 100644
--- a/lfs/minicom
+++ b/lfs/minicom
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = minicom
 PAK_VER    = 0
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/minidlna b/lfs/minidlna
index 6368004ed..4402181c2 100644
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = minidlna
 PAK_VER    = 4
 
-DEPS       = "ffmpeg flac libexif libid3tag libogg"
+DEPS       = ffmpeg flac libexif libid3tag libogg
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/monit b/lfs/monit
index 9cdcd2f5f..99750370a 100644
--- a/lfs/monit
+++ b/lfs/monit
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = monit
 PAK_VER    = 11
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/motion b/lfs/motion
index 1e1665426..c00fde89e 100644
--- a/lfs/motion
+++ b/lfs/motion
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = motion
 PAK_VER    = 2
-DEPS       = "ffmpeg"
+DEPS       = ffmpeg
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/mpc b/lfs/mpc
index ac0dce6b4..5f3340b98 100644
--- a/lfs/mpc
+++ b/lfs/mpc
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpc
 PAK_VER    = 6
 
-DEPS       = "mpd libmpdclient"
+DEPS       = mpd libmpdclient
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/mpd b/lfs/mpd
index 25c3e57d7..0ea049d80 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
 PAK_VER    = 19
 
-DEPS       = "alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr"
+DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/mpfire b/lfs/mpfire
index 9a14dcb28..65196a0aa 100644
--- a/lfs/mpfire
+++ b/lfs/mpfire
@@ -32,7 +32,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpfire
 PAK_VER    = 12
 
-DEPS       = "mpd mpc"
+DEPS       = mpd mpc
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/mtr b/lfs/mtr
index da856f417..c812b6ff8 100644
--- a/lfs/mtr
+++ b/lfs/mtr
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mtr
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/nagios-plugins b/lfs/nagios-plugins
index 217563554..fcd7aa15e 100644
--- a/lfs/nagios-plugins
+++ b/lfs/nagios-plugins
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios-plugins
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe
index 133a9738e..bb736a997 100644
--- a/lfs/nagios_nrpe
+++ b/lfs/nagios_nrpe
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios_nrpe
 PAK_VER    = 5
 
-DEPS       = "nagios-plugins"
+DEPS       = nagios-plugins
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/nano b/lfs/nano
index 02ba358c4..b37d80cdf 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nano
 PAK_VER    = 28
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/ncat b/lfs/ncat
index 228750a19..d21c066d5 100644
--- a/lfs/ncat
+++ b/lfs/ncat
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ncat
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/netpbm b/lfs/netpbm
index 58a6921a4..25de86bce 100644
--- a/lfs/netpbm
+++ b/lfs/netpbm
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = netpbm
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 CFLAGS    += -flax-vector-conversions
 
diff --git a/lfs/netsnmpd b/lfs/netsnmpd
index ebba6f438..bd8aac336 100644
--- a/lfs/netsnmpd
+++ b/lfs/netsnmpd
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = netsnmpd
 PAK_VER    = 9
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/nfs b/lfs/nfs
index 40c17b788..882792684 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nfs
 PAK_VER    = 13
 
-DEPS       = "rpcbind"
+DEPS       = rpcbind
 
 LIBNFSIDMAP = 0.25
 
diff --git a/lfs/nmap b/lfs/nmap
index 7ac35dfd8..39d740e89 100644
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nmap
 PAK_VER    = 11
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/nut b/lfs/nut
index 1502c63cb..def3c36df 100644
--- a/lfs/nut
+++ b/lfs/nut
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nut
 PAK_VER    = 7
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/observium-agent b/lfs/observium-agent
index e533a451e..9fddb69d6 100644
--- a/lfs/observium-agent
+++ b/lfs/observium-agent
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = observium-agent
 PAK_VER    = 1
 
-DEPS       = "xinetd"
+DEPS       = xinetd
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/openldap b/lfs/openldap
index 320b1abd4..16c3737b4 100644
--- a/lfs/openldap
+++ b/lfs/openldap
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = openldap
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 export CPPFLAGS = -D_GNU_SOURCE
 
diff --git a/lfs/openvmtools b/lfs/openvmtools
index 296ba28bb..36a2ca22c 100644
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -35,7 +35,7 @@ SUP_ARCH   = x86_64 i586
 PROG       = openvmtools
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/opus b/lfs/opus
index 8faa7d00a..ccc85ff6d 100644
--- a/lfs/opus
+++ b/lfs/opus
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = opus
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/pakfire3 b/lfs/pakfire3
index 3f0e6c320..2380be3fa 100644
--- a/lfs/pakfire3
+++ b/lfs/pakfire3
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG	   = pakfire3
 PAK_VER    = 5
 
-DEPS       = "libsolv pycurl pygpgme python-progressbar python-xattr urlgrabber"
+DEPS       = libsolv pycurl pygpgme python-progressbar python-xattr urlgrabber
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/parted b/lfs/parted
index dc68ba850..910e2cfe2 100644
--- a/lfs/parted
+++ b/lfs/parted
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = parted
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/pcengines-apu-firmware b/lfs/pcengines-apu-firmware
index 71d8eea26..dd76004f8 100644
--- a/lfs/pcengines-apu-firmware
+++ b/lfs/pcengines-apu-firmware
@@ -34,7 +34,7 @@ PROG       = pcengines-apu-firmware
 PAK_VER    = 4
 SUP_ARCH   = i586 x86_64
 
-DEPS       = "firmware-update"
+DEPS       = firmware-update
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/pcmciautils b/lfs/pcmciautils
index 1074969f4..b71e2a221 100644
--- a/lfs/pcmciautils
+++ b/lfs/pcmciautils
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pcmciautils
 PAK_VER    = 1
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/perl-Authen-SASL b/lfs/perl-Authen-SASL
index e5da8fbb0..78df0108f 100644
--- a/lfs/perl-Authen-SASL
+++ b/lfs/perl-Authen-SASL
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-Authen-SASL
-DEPS       = ""
+DEPS       =
 PAK_VER    = 2
 
 ###############################################################################
diff --git a/lfs/perl-Carp-Clan b/lfs/perl-Carp-Clan
index 590ad7eac..3d9f85ff3 100644
--- a/lfs/perl-Carp-Clan
+++ b/lfs/perl-Carp-Clan
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-Carp-Clan
-DEPS       = ""
+DEPS       =
 PAK_VER    = 4
 
 ###############################################################################
diff --git a/lfs/perl-DBD-SQLite b/lfs/perl-DBD-SQLite
index 07d2ae703..37d09ecf9 100644
--- a/lfs/perl-DBD-SQLite
+++ b/lfs/perl-DBD-SQLite
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-DBD-SQLite
 PAK_VER    = 2
 
-DEPS       = "perl-DBI"
+DEPS       = perl-DBI
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/perl-Date-Calc b/lfs/perl-Date-Calc
index 66c77ea54..21cd9fd77 100644
--- a/lfs/perl-Date-Calc
+++ b/lfs/perl-Date-Calc
@@ -31,7 +31,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-Date-Calc
-DEPS       = "perl-Carp-Clan"
+DEPS       = perl-Carp-Clan
 PAK_VER    = 4
 
 ###############################################################################
diff --git a/lfs/perl-Date-Manip b/lfs/perl-Date-Manip
index efa731fbe..5802e46ee 100644
--- a/lfs/perl-Date-Manip
+++ b/lfs/perl-Date-Manip
@@ -31,7 +31,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-Date-Manip
-DEPS       = ""
+DEPS       =
 PAK_VER    = 5
 
 ###############################################################################
diff --git a/lfs/perl-File-ReadBackwards b/lfs/perl-File-ReadBackwards
index 3504d8586..475f86abd 100644
--- a/lfs/perl-File-ReadBackwards
+++ b/lfs/perl-File-ReadBackwards
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-File-ReadBackwards
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/perl-File-Tail b/lfs/perl-File-Tail
index 52f21550f..c9b4cbde4 100644
--- a/lfs/perl-File-Tail
+++ b/lfs/perl-File-Tail
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-File-Tail
-DEPS       = ""
+DEPS       =
 PAK_VER    = 4
 
 ###############################################################################
diff --git a/lfs/perl-MIME-Base64 b/lfs/perl-MIME-Base64
index a7e30bcf8..00623560e 100644
--- a/lfs/perl-MIME-Base64
+++ b/lfs/perl-MIME-Base64
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-MIME-Base64
-DEPS       = ""
+DEPS       =
 PAK_VER    = 2
 
 ###############################################################################
diff --git a/lfs/perl-Net-IP b/lfs/perl-Net-IP
index 2c6ea0a98..437652bd9 100644
--- a/lfs/perl-Net-IP
+++ b/lfs/perl-Net-IP
@@ -32,7 +32,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = perl-Net-IP
-DEPS       = ""
+DEPS       =
 PAK_VER    = 2
 
 ###############################################################################
diff --git a/lfs/perl-Net-LibIDN b/lfs/perl-Net-LibIDN
index 70fc98c19..a9ec173b9 100644
--- a/lfs/perl-Net-LibIDN
+++ b/lfs/perl-Net-LibIDN
@@ -32,7 +32,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = perl-Net-LibIDN
-DEPS       = ""
+DEPS       =
 PAK_VER    = 1
 
 ###############################################################################
diff --git a/lfs/perl-Net-SMTP-SSL b/lfs/perl-Net-SMTP-SSL
index 70c52ce05..90e8a2260 100644
--- a/lfs/perl-Net-SMTP-SSL
+++ b/lfs/perl-Net-SMTP-SSL
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-Net-SMTP-SSL
-DEPS       = ""
+DEPS       =
 PAK_VER    = 2
 
 ###############################################################################
diff --git a/lfs/perl-TimeDate b/lfs/perl-TimeDate
index 0fea30296..a2a06ae3c 100644
--- a/lfs/perl-TimeDate
+++ b/lfs/perl-TimeDate
@@ -31,7 +31,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-TimeDate
-DEPS       = ""
+DEPS       =
 PAK_VER    = 4
 
 ###############################################################################
diff --git a/lfs/perl-common-sense b/lfs/perl-common-sense
index 8c9d6612a..879caea99 100644
--- a/lfs/perl-common-sense
+++ b/lfs/perl-common-sense
@@ -32,7 +32,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = perl-common-sense
-DEPS       = ""
+DEPS       =
 PAK_VER    = 2
 
 ###############################################################################
diff --git a/lfs/perl-gettext b/lfs/perl-gettext
index d409892ad..afe8db78a 100644
--- a/lfs/perl-gettext
+++ b/lfs/perl-gettext
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = perl-gettext
-DEPS       = ""
+DEPS       =
 PAK_VER    = 4
 
 ###############################################################################
diff --git a/lfs/perl-inotify2 b/lfs/perl-inotify2
index 730b8ed7f..7d94da395 100644
--- a/lfs/perl-inotify2
+++ b/lfs/perl-inotify2
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = perl-inotify2
-DEPS       = "perl-common-sense"
+DEPS       = perl-common-sense
 PAK_VER    = 2
 
 ###############################################################################
diff --git a/lfs/postfix b/lfs/postfix
index e5ce6a7f6..55dd21e93 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
 PAK_VER    = 23
 
-DEPS       = ""
+DEPS       =
 
 CCARGS     = `getconf LFS_CFLAGS` \
 	-DDEF_DAEMON_DIR="'\"/usr/lib/postfix\"'" \
diff --git a/lfs/powertop b/lfs/powertop
index f8a12abca..85a90a1c6 100644
--- a/lfs/powertop
+++ b/lfs/powertop
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = powertop
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/pycurl b/lfs/pycurl
index 91fe3be16..4733c4cd5 100644
--- a/lfs/pycurl
+++ b/lfs/pycurl
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pycurl
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 CFLAGS    += -DHAVE_CURL_OPENSSL
 
diff --git a/lfs/pygpgme b/lfs/pygpgme
index 3078232ff..6700735eb 100644
--- a/lfs/pygpgme
+++ b/lfs/pygpgme
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pygpgme
 PAK_VER    = 1
 
-DEPS       = "gpgme"
+DEPS       = gpgme
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-clientform b/lfs/python-clientform
index adf5f17f8..29804a969 100644
--- a/lfs/python-clientform
+++ b/lfs/python-clientform
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-clientform
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-distutils-extra b/lfs/python-distutils-extra
index d11ca2561..5ca5a31b2 100644
--- a/lfs/python-distutils-extra
+++ b/lfs/python-distutils-extra
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-distutils-extra
 PAK_VER    = 1
 
-DEPS       = "python-distutils"
+DEPS       = python-distutils
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-feedparser b/lfs/python-feedparser
index a111f5320..e89018d0a 100644
--- a/lfs/python-feedparser
+++ b/lfs/python-feedparser
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-feedparser
 PAK_VER    = 2
 
-DEPS       = "python-mechanize"
+DEPS       = python-mechanize
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-lzma b/lfs/python-lzma
index a0b02c3eb..7ac21d89d 100644
--- a/lfs/python-lzma
+++ b/lfs/python-lzma
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-lzma
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-m2crypto b/lfs/python-m2crypto
index d870bed45..de004bfd9 100644
--- a/lfs/python-m2crypto
+++ b/lfs/python-m2crypto
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 #PROG       = python-m2crypto
 #PAK_VER    = 1
 
-#DEPS       = ""
+#DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-mechanize b/lfs/python-mechanize
index 3c8ca772e..8a879bc1c 100644
--- a/lfs/python-mechanize
+++ b/lfs/python-mechanize
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-mechanize
 PAK_VER    = 2
 
-DEPS       = "python-clientform"
+DEPS       = python-clientform
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-progressbar b/lfs/python-progressbar
index 4a8a3a8f4..b40d8e466 100644
--- a/lfs/python-progressbar
+++ b/lfs/python-progressbar
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-progressbar
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-pyparsing b/lfs/python-pyparsing
index 17581bff1..f42e1ac94 100644
--- a/lfs/python-pyparsing
+++ b/lfs/python-pyparsing
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-pyparsing
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-rssdler b/lfs/python-rssdler
index 91ff8e732..2b73a2774 100644
--- a/lfs/python-rssdler
+++ b/lfs/python-rssdler
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-rssdler
 PAK_VER    = 2
 
-DEPS       = "python-feedparser python-mechanize"
+DEPS       = python-feedparser python-mechanize
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-setuptools b/lfs/python-setuptools
index 76a519f71..1ffcfca18 100644
--- a/lfs/python-setuptools
+++ b/lfs/python-setuptools
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-setuptools
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-six b/lfs/python-six
index 89b54c36f..3383e6d0d 100644
--- a/lfs/python-six
+++ b/lfs/python-six
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-six
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python-xattr b/lfs/python-xattr
index 0f18004b7..a77d22a91 100644
--- a/lfs/python-xattr
+++ b/lfs/python-xattr
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python-xattr
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3 b/lfs/python3
index 8df184933..3d3a27861 100644
--- a/lfs/python3
+++ b/lfs/python3
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3
 
-DEPS       = ""
+DEPS       =
 
 # Normal build or $(TOOLS_DIR) build.
 #
diff --git a/lfs/python3-botocore b/lfs/python3-botocore
index f501516f4..bfa51eaca 100644
--- a/lfs/python3-botocore
+++ b/lfs/python3-botocore
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-botocore
 PAK_VER    = 2
 
-DEPS       = "python3-dateutil python3-jmespath"
+DEPS       = python3-dateutil python3-jmespath
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-colorama b/lfs/python3-colorama
index 44494316d..e7bc004b1 100644
--- a/lfs/python3-colorama
+++ b/lfs/python3-colorama
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-colorama
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-dateutil b/lfs/python3-dateutil
index 509d4e99f..3ac80b60d 100644
--- a/lfs/python3-dateutil
+++ b/lfs/python3-dateutil
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-dateutil
 PAK_VER    = 2
 
-DEPS       = "python3-six"
+DEPS       = python3-six
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-docutils b/lfs/python3-docutils
index e26e99b4e..d0c9518d3 100644
--- a/lfs/python3-docutils
+++ b/lfs/python3-docutils
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-docutils
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-jmespath b/lfs/python3-jmespath
index 895f3696d..4db53be67 100644
--- a/lfs/python3-jmespath
+++ b/lfs/python3-jmespath
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-jmespath
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-llfuse b/lfs/python3-llfuse
index 871ac6125..261e5abc9 100644
--- a/lfs/python3-llfuse
+++ b/lfs/python3-llfuse
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-llfuse
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-msgpack b/lfs/python3-msgpack
index d218dcd8c..dc764f5b3 100644
--- a/lfs/python3-msgpack
+++ b/lfs/python3-msgpack
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-msgpack
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-pyasn1 b/lfs/python3-pyasn1
index c1d2616fc..1092395b5 100644
--- a/lfs/python3-pyasn1
+++ b/lfs/python3-pyasn1
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-pyasn1
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-rsa b/lfs/python3-rsa
index 6a885d602..c3d3a9d1e 100644
--- a/lfs/python3-rsa
+++ b/lfs/python3-rsa
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-rsa
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-s3transfer b/lfs/python3-s3transfer
index 7a0e40bcd..04989b601 100644
--- a/lfs/python3-s3transfer
+++ b/lfs/python3-s3transfer
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-s3transfer
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-setuptools b/lfs/python3-setuptools
index c986ed891..8a78fbe02 100644
--- a/lfs/python3-setuptools
+++ b/lfs/python3-setuptools
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-setuptools
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-setuptools-scm b/lfs/python3-setuptools-scm
index 544f5f1bc..048d92895 100644
--- a/lfs/python3-setuptools-scm
+++ b/lfs/python3-setuptools-scm
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-setuptools-scm
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-six b/lfs/python3-six
index 7277e9d7b..9e1f721a9 100644
--- a/lfs/python3-six
+++ b/lfs/python3-six
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-six
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/python3-yaml b/lfs/python3-yaml
index 21e9e2aa0..b8cda7f40 100644
--- a/lfs/python3-yaml
+++ b/lfs/python3-yaml
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-yaml
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/qemu b/lfs/qemu
index 967388ea6..8005a11c9 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -35,7 +35,7 @@ SUP_ARCH   = i586 x86_64
 PROG       = qemu
 PAK_VER    = 26
 
-DEPS       = "libusbredir spice libseccomp"
+DEPS       = libusbredir spice libseccomp
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/rpcbind b/lfs/rpcbind
index 551453dbf..3c379c99e 100644
--- a/lfs/rpcbind
+++ b/lfs/rpcbind
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rpcbind
 PAK_VER    = 2
 
-DEPS       = "libtirpc"
+DEPS       = libtirpc
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/rsync b/lfs/rsync
index 18e6d9e1c..342de920b 100644
--- a/lfs/rsync
+++ b/lfs/rsync
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = rsync
 PAK_VER    = 11
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/samba b/lfs/samba
index c437793d6..aa6f1fd62 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
 PAK_VER    = 68
 
-DEPS       = "cups krb5"
+DEPS       = cups krb5
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/sane b/lfs/sane
index 139a9af48..c932e9970 100644
--- a/lfs/sane
+++ b/lfs/sane
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sane
 PAK_VER    = 6
 
-DEPS       = "avahi cups libtiff"
+DEPS       = avahi cups libtiff
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/sarg b/lfs/sarg
index 622f719fd..dbdee1f33 100644
--- a/lfs/sarg
+++ b/lfs/sarg
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sarg
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/sdl b/lfs/sdl
index 868010e06..0e96af04d 100644
--- a/lfs/sdl
+++ b/lfs/sdl
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sdl
 PAK_VER    = 3
 
-DEPS       = "alsa"
+DEPS       = alsa
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/sendEmail b/lfs/sendEmail
index 171f7ab91..ea2345f22 100644
--- a/lfs/sendEmail
+++ b/lfs/sendEmail
@@ -19,7 +19,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sendEmail
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/shairport-sync b/lfs/shairport-sync
index b70fbca73..6f1ad633b 100644
--- a/lfs/shairport-sync
+++ b/lfs/shairport-sync
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = shairport-sync
 PAK_VER    = 3
 
-DEPS       = "alac alsa avahi libdaemon soxr"
+DEPS       = alac alsa avahi libdaemon soxr
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/sox b/lfs/sox
index fcbda5df9..b5666fb07 100644
--- a/lfs/sox
+++ b/lfs/sox
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sox
 PAK_VER    = 1
 
-DEPS       = "libvorbis"
+DEPS       = libvorbis
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/soxr b/lfs/soxr
index 261ab9081..1660a13ff 100644
--- a/lfs/soxr
+++ b/lfs/soxr
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = soxr
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/spamassassin b/lfs/spamassassin
index 08f4f0c5e..d1ad7ddd7 100644
--- a/lfs/spamassassin
+++ b/lfs/spamassassin
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spamassassin
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/spandsp b/lfs/spandsp
index c186607ea..62226d88e 100644
--- a/lfs/spandsp
+++ b/lfs/spandsp
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spandsp
 PAK_VER    = 4
 
-DEPS       = "libtiff"
+DEPS       = libtiff
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/spectre-meltdown-checker b/lfs/spectre-meltdown-checker
index 6c540dfa5..c05c5fead 100644
--- a/lfs/spectre-meltdown-checker
+++ b/lfs/spectre-meltdown-checker
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spectre-meltdown-checker
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/speedtest-cli b/lfs/speedtest-cli
index c8049d240..446844ab3 100644
--- a/lfs/speedtest-cli
+++ b/lfs/speedtest-cli
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = speedtest-cli
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/spice b/lfs/spice
index bdba4f5a9..8ffb54d1c 100644
--- a/lfs/spice
+++ b/lfs/spice
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spice
 PAK_VER    = 4
 
-DEPS       = "opus"
+DEPS       = opus
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/spice-protocol b/lfs/spice-protocol
index ac450c850..00f2e57b3 100644
--- a/lfs/spice-protocol
+++ b/lfs/spice-protocol
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = spice-protocol
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/squid-accounting b/lfs/squid-accounting
index 8bda73a5a..bc39142cf 100644
--- a/lfs/squid-accounting
+++ b/lfs/squid-accounting
@@ -17,7 +17,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squid-accounting
 PAK_VER    = 12
 
-DEPS       = "perl-DBI perl-DBD-SQLite perl-File-ReadBackwards"
+DEPS       = perl-DBI perl-DBD-SQLite perl-File-ReadBackwards
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/squidclamav b/lfs/squidclamav
index 01befe50f..b4f79ab96 100644
--- a/lfs/squidclamav
+++ b/lfs/squidclamav
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squidclamav
 PAK_VER    = 21
 
-DEPS       = "clamav"
+DEPS       = clamav
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/sslh b/lfs/sslh
index 100cec065..c5e8cdd63 100644
--- a/lfs/sslh
+++ b/lfs/sslh
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sslh
 PAK_VER    = 5
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/strace b/lfs/strace
index c8ad9ce03..11d7c49f6 100644
--- a/lfs/strace
+++ b/lfs/strace
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = strace
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/stress b/lfs/stress
index 19501d25a..bf336eb96 100644
--- a/lfs/stress
+++ b/lfs/stress
@@ -19,7 +19,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = stress
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/stunnel b/lfs/stunnel
index d23196a33..c7e8608c3 100644
--- a/lfs/stunnel
+++ b/lfs/stunnel
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = stunnel
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/swatch b/lfs/swatch
index b27cfb4d4..6977137b0 100644
--- a/lfs/swatch
+++ b/lfs/swatch
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = swatch
 PAK_VER    = 3
 
-DEPS       = "perl-File-Tail perl-Date-Calc perl-TimeDate perl-Date-Manip"
+DEPS       = perl-File-Tail perl-Date-Calc perl-TimeDate perl-Date-Manip
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/sysbench b/lfs/sysbench
index 932e41fe7..557c00ee3 100644
--- a/lfs/sysbench
+++ b/lfs/sysbench
@@ -19,7 +19,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sysbench
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/taglib b/lfs/taglib
index ad7da286b..f934928bd 100644
--- a/lfs/taglib
+++ b/lfs/taglib
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = taglib
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/tcpdump b/lfs/tcpdump
index b22a1a043..b4e6b0e2a 100644
--- a/lfs/tcpdump
+++ b/lfs/tcpdump
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tcpdump
 PAK_VER    = 11
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/telnet b/lfs/telnet
index 651ab9769..8761b14f2 100644
--- a/lfs/telnet
+++ b/lfs/telnet
@@ -33,7 +33,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = telnet
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/tftpd b/lfs/tftpd
index 80062d2cc..ed2f1ad43 100644
--- a/lfs/tftpd
+++ b/lfs/tftpd
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tftpd
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/tmux b/lfs/tmux
index e91f5e0cf..40f19dfea 100644
--- a/lfs/tmux
+++ b/lfs/tmux
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tmux
 PAK_VER    = 7
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/tor b/lfs/tor
index e7feebc2e..b6a1639d9 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
 PAK_VER    = 47
 
-DEPS       = "libseccomp"
+DEPS       = libseccomp
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/traceroute b/lfs/traceroute
index 2a29c858f..87157ff42 100644
--- a/lfs/traceroute
+++ b/lfs/traceroute
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = traceroute
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/transmission b/lfs/transmission
index 4eac88bd9..6f52d6e5a 100644
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = transmission
 PAK_VER    = 16
 
-DEPS       = ""
+DEPS       =
 
 CXXFLAGS  += -fno-exceptions
 
diff --git a/lfs/tshark b/lfs/tshark
index 1a513c9ff..b82b617c4 100644
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tshark
-DEPS       = "krb5"
+DEPS       = krb5
 PAK_VER    = 5
 
 ###############################################################################
diff --git a/lfs/urlgrabber b/lfs/urlgrabber
index 2c1f38239..ab0a0b68c 100644
--- a/lfs/urlgrabber
+++ b/lfs/urlgrabber
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = urlgrabber
 PAK_VER    = 1
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/util-macros b/lfs/util-macros
index 4f6086042..90a4ac135 100644
--- a/lfs/util-macros
+++ b/lfs/util-macros
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = util-macros
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/vdr b/lfs/vdr
index d3958fda9..e40174e24 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -39,7 +39,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
 PAK_VER    = 11
 
-DEPS       = "vdr_streamdev"
+DEPS       = vdr_streamdev
 
 MAKE_OPTIONS = \
 	PREFIX=/usr \
diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi
index eed576124..8be532f57 100644
--- a/lfs/vdr_dvbapi
+++ b/lfs/vdr_dvbapi
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_dvbapi
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 VDRPLUGVER = 2.4.1
 
diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg
index 75c70d521..34ecdb30c 100644
--- a/lfs/vdr_eepg
+++ b/lfs/vdr_eepg
@@ -38,7 +38,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_eepg
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 VDRPLUGVER = 2.4.1
 
diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch
index 7836d7c7d..607030d30 100644
--- a/lfs/vdr_epgsearch
+++ b/lfs/vdr_epgsearch
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_epgsearch
 PAK_VER    = 8
 
-DEPS       = ""
+DEPS       =
 
 VDRPLUGVER = 2.4.1
 
diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev
index 9e4cf7bdc..254203c23 100644
--- a/lfs/vdr_streamdev
+++ b/lfs/vdr_streamdev
@@ -36,7 +36,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr_streamdev
 PAK_VER    = 3
 
-DEPS       = ""
+DEPS       =
 
 VDRPLUGVER = 2.4.1
 
diff --git a/lfs/vdradmin b/lfs/vdradmin
index de9680b1b..346b19489 100644
--- a/lfs/vdradmin
+++ b/lfs/vdradmin
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdradmin
 PAK_VER    = 6
 
-DEPS       = "perl-gettext vdr vdr_epgsearch"
+DEPS       = perl-gettext vdr vdr_epgsearch
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/w_scan b/lfs/w_scan
index 4b5229c3e..62e77962d 100644
--- a/lfs/w_scan
+++ b/lfs/w_scan
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = w_scan
 PAK_VER    = 7
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/watchdog b/lfs/watchdog
index cd8c11bd0..abea7b0d1 100644
--- a/lfs/watchdog
+++ b/lfs/watchdog
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = watchdog
 PAK_VER    = 4
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/wavemon b/lfs/wavemon
index 65dc4bb38..8b66f4dfd 100644
--- a/lfs/wavemon
+++ b/lfs/wavemon
@@ -19,7 +19,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = wavemon
 PAK_VER    = 1
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/xvid b/lfs/xvid
index 5690b8038..bb23b83ce 100644
--- a/lfs/xvid
+++ b/lfs/xvid
@@ -34,7 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = xvid
 PAK_VER    = 2
 
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index 8aac4d000..c69643a54 100644
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = zabbix_agentd
 PAK_VER    = 4
-DEPS       = ""
+DEPS       =
 
 ###############################################################################
 # Top-level Rules
-- 
2.20.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 3/4] Config: Refactor mastering packages
  2020-03-23 19:34 [PATCH 1/4] cdrom: Cleanup everything after mastering Michael Tremer
  2020-03-23 19:34 ` [PATCH 2/4] lfs: Drop quotes in DEPS variable Michael Tremer
@ 2020-03-23 19:34 ` Michael Tremer
  2020-03-23 19:34 ` [PATCH 4/4] core-updates: Ensure we have no temporary data in the package Michael Tremer
  2 siblings, 0 replies; 4+ messages in thread
From: Michael Tremer @ 2020-03-23 19:34 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 4364 bytes --]

Those are now created in their own temporary directory, so that
no other files can be included by accident.

We also package with fewer temporary files.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/Config | 70 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/lfs/Config b/lfs/Config
index 3c552f3f0..faf01ca1a 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -98,6 +98,7 @@ DIR_CHK     = $(LFS_BASEDIR)/cache/check
 DIR_CONF    = $(LFS_BASEDIR)/config
 DIR_INFO    = $(LFS_BASEDIR)/log
 DIR_TMP     = /tmp
+DIR_TMP_PAK = $(DIR_TMP)/package-$(PROG)
 
 # Add the compiler location and version and specs to the ccache hash
 CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' ' -f1)
@@ -227,39 +228,62 @@ endef
 
 define PAK
 	# Bringing the files to their right place.
-	@rm -rf /install/packages/package
-	@mkdir -p /install/packages/package/tmp
+	@rm -rf $(DIR_TMP_PAK) && mkdir -p $(DIR_TMP_PAK)
 	if [ -e "/usr/src/src/paks/$(PROG)" ]; then \
 		cp -f /usr/src/src/paks/$(PROG)/{,un}install.sh /usr/src/src/paks/$(PROG)/update.sh \
-		/install/packages/package; \
+		$(DIR_TMP_PAK); \
 	else \
 		cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/update.sh \
-		/install/packages/package; \
+		$(DIR_TMP_PAK); \
 	fi
 	for i in $(DIR_SRC)/config/rootfiles/packages/{$(BUILD_ARCH),}/$(PROG); do \
 		if [ -e "$${i}" ]; then \
-			cp -v $${i} /install/packages/package/ROOTFILES; \
+			cp -v $${i} $(DIR_TMP_PAK)/ROOTFILES; \
 			break; \
 		fi; \
 	done
-	sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(BUILD_ARCH)/g' -i /install/packages/package/ROOTFILES
-	sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
-	chmod 755 /install/packages/package/{{,un}install,update}.sh
-	cd / && tar cfp /install/packages/package/files.tmp --numeric-owner --exclude='#*' --exclude='__pycache__' --files-from=/install/packages/package/ROOTFILES
-	# Double tar to remove double files
-	tar xfp /install/packages/package/files.tmp --numeric-owner -C /install/packages/package/tmp/
-	rm -f /install/packages/package/files.tmp
-	cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner * | xz $(XZ_OPT) > /install/packages/package/files.tar.xz
-	rm -r /install/packages/package/tmp
-	-cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp
-	mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES
-	cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire --files-from=/usr/src/src/paks/files
-	rm -rf /install/packages/package
-	sed -e s/NAME/$(PROG)/g \
-			-e s/VER/$(VER)/g \
-			-e s/RELEASE/$(PAK_VER)/g \
-			-e s/DEPS/$(DEPS)/g \
-			-e s/SIZE/`ls -l \/install\/packages\/$(PROG)-$(VER)-$(PAK_VER).ipfire | awk '{ print $$5 }'`/g \
+
+	# Replace variables in rootfiles
+	sed -i $(DIR_TMP_PAK)/ROOTFILES \
+		-e 's/BUILDTARGET/$(BUILDTARGET)/g' \
+		-e 's/KVER/$(KVER)/g' \
+		-e 's/MACHINE/$(BUILD_ARCH)/g'
+
+	# Replace variables in scripts
+	sed -i $(DIR_TMP_PAK)/install.sh \
+		-e 's/xxxKVERxxx/$(KVER)/g'
+
+	# Make scripts executable
+	chmod 754 $(DIR_TMP_PAK)/{{,un}install,update}.sh
+
+	# Collect all files
+	rm -rf $(DIR_TMP_PAK)/root && mkdir -p $(DIR_TMP_PAK)/root
+	tar -c --exclude='#*' --exclude='proc/*' --exclude='dev/pts/*' --exclude='tmp/*' \
+		--exclude='__pycache__' \
+		-C / --files-from=$(DIR_TMP_PAK)/ROOTFILES | tar -x -C $(DIR_TMP_PAK)/root
+
+	# Compress tarball
+	cd $(DIR_TMP_PAK)/root && tar cf - * | xz $(XZ_OPT) > $(DIR_TMP_PAK)/files.tar.xz
+
+	# Cleanup temporary files
+	rm -rf $(DIR_TMP_PAK)/root
+
+	# Remove any commented lines
+	sed -i $(DIR_TMP_PAK)/ROOTFILES -e "/^#/d"
+
+	# Make package
+	cd $(DIR_TMP_PAK) && tar cf /install/packages/$(PROG)-$(VER)-$(PAK_VER).ipfire *
+
+	# Cleanup
+	rm -rf $(DIR_TMP_PAK)
+
+	# Create meta file
+	sed \
+		-e "s/NAME/$(PROG)/g" \
+		-e "s/VER/$(VER)/g" \
+		-e "s/RELEASE/$(PAK_VER)/g" \
+		-e "s/DEPS/$(DEPS)/g" \
+		-e "s/SIZE/$$(stat --format=\"%s\" /install/packages/$(PROG)-$(VER)-$(PAK_VER).ipfire)/g" \
 	  < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
 endef
 
-- 
2.20.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 4/4] core-updates: Ensure we have no temporary data in the package
  2020-03-23 19:34 [PATCH 1/4] cdrom: Cleanup everything after mastering Michael Tremer
  2020-03-23 19:34 ` [PATCH 2/4] lfs: Drop quotes in DEPS variable Michael Tremer
  2020-03-23 19:34 ` [PATCH 3/4] Config: Refactor mastering packages Michael Tremer
@ 2020-03-23 19:34 ` Michael Tremer
  2 siblings, 0 replies; 4+ messages in thread
From: Michael Tremer @ 2020-03-23 19:34 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1329 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/cdrom        | 3 ---
 lfs/core-updates | 2 +-
 lfs/flash-images | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lfs/cdrom b/lfs/cdrom
index 175a5aedc..f18b80a03 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -255,9 +255,6 @@ endif
 	cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) \
 		-o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso .
 
-	# Cleanup everything
-	rm -rf $(DIR_TMP)/cdrom
-
 ifeq "$(HAS_ISOLINUX)" "1"
 	isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
 endif
diff --git a/lfs/core-updates b/lfs/core-updates
index fe4fb837c..e0dfa69f4 100644
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -52,7 +52,7 @@ $(TARGET) : $(CORE)
 
 .PHONY:
 core/%:
-	rm -rf /install/packages/package
+	rm -rf /install/packages/package /tmp/*
 	mkdir -p /install/packages/package
 	eval $$(cat /usr/src/config/rootfiles/$@/meta)
 
diff --git a/lfs/flash-images b/lfs/flash-images
index 422acac22..5f39c488f 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -262,4 +262,4 @@ endif
 
 	# Compress Image
 	xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)
-	rm -rf $(IMG) $(MNThdd)
+	rm -rf $(IMG) $(MNThdd) $(DIR_TMP)/cdrom
-- 
2.20.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-03-23 19:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-23 19:34 [PATCH 1/4] cdrom: Cleanup everything after mastering Michael Tremer
2020-03-23 19:34 ` [PATCH 2/4] lfs: Drop quotes in DEPS variable Michael Tremer
2020-03-23 19:34 ` [PATCH 3/4] Config: Refactor mastering packages Michael Tremer
2020-03-23 19:34 ` [PATCH 4/4] core-updates: Ensure we have no temporary data in the package Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox