nss-myhostname: Drop package

This does not have any effect because we configured it after dns.
Therefore we can drop the entire package as we don't use any of its
functionality.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/etc/nsswitch.conf b/config/etc/nsswitch.conf
index 468fd1c88a818a777974baba8a34a1c759b5c7b4..067e63b48f6c6db4dac48e62db125fd0cf47a780 100644 (file)
--- a/config/etc/nsswitch.conf
+++ b/config/etc/nsswitch.conf
@@ -4,7 +4,7 @@ passwd: files
 group: files
 shadow: files
 
-hosts: files dns myhostname
+hosts: files dns
 networks: files
 
 protocols: files

diff --git a/config/rootfiles/common/nss-myhostname b/config/rootfiles/common/nss-myhostname
deleted file mode 100644 (file)
index 13f38ae..0000000
--- a/config/rootfiles/common/nss-myhostname
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/libnss_myhostname.so.2
-#usr/share/doc/nss-myhostname
-#usr/share/doc/nss-myhostname/README.html
-#usr/share/doc/nss-myhostname/style.css

diff --git a/config/rootfiles/core/203/filelists/files b/config/rootfiles/core/203/filelists/files
index 316e67e26b9f4314f2cac748e1b6c292ef571f80..993756d8601566c8cc3d1fbd0776e5ca31fdc7e5 100644 (file)
--- a/config/rootfiles/core/203/filelists/files
+++ b/config/rootfiles/core/203/filelists/files
@@ -1,3 +1,4 @@
+etc/nsswitch.conf
 etc/rc.d/helper/aws-setup
 etc/rc.d/init.d/cleanfs
 etc/rc.d/init.d/dhcp

diff --git a/config/rootfiles/core/203/update.sh b/config/rootfiles/core/203/update.sh
index e8d9b2a37439811dadd6047cedcaea321dbde6e8..0b1bcfa664bb47cc7a949c25ce3a644375040e56 100644 (file)
--- a/config/rootfiles/core/203/update.sh
+++ b/config/rootfiles/core/203/update.sh
@@ -94,6 +94,10 @@ rm -rfv \
 rm -vf \
        /usr/lib/libboost*.so.1.89.0
 
+# Remove nss-myhostname
+rm -vf \
+       /lib/libnss_myhostname.so.2
+
 # update linker config
 ldconfig
 

diff --git a/lfs/nss-myhostname b/lfs/nss-myhostname
deleted file mode 100644 (file)
index 91c802b..0000000
--- a/lfs/nss-myhostname
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 0.3
-
-THISAPP    = nss-myhostname-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 99b9cc42c8dc5a73afe9dddfad6c05d175246ffb7985fb90b3f1bab96c8b5afde012e41f5770d2671eefd1f86be81b576637994bffb5e00adab7ac2c986c09b7
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-       @$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       $(UPDATE_AUTOMAKE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index b7fe2869df8cb552fd6067d17e049d32bb7c6b2f..b317d0418754fd93aa4139de65e7f1ae91946542 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -2120,7 +2120,6 @@ build_system() {
        lfsmake2 iftop
        lfsmake2 mdns-repeater
        lfsmake2 i2c-tools
-       lfsmake2 nss-myhostname
        lfsmake2 dehydrated
        lfsmake2 libplist
        lfsmake2 nqptp