Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/06/13 19:07:10+02:00 uni-frankfurt.de!mickey
use  as default hostname

BKrev: 40cc89c4Fk8OUfFIW6lYjnSdkwaf9w

10 files changed, 1 insertions, 11 deletions

diff --git a/base-files/base-files/collie/hostname b/base-files/base-files/collie/hostname
deleted file mode 100644
index e69de29bb2..0000000000
--- a/base-files/base-files/collie/hostname
+++ /dev/null
diff --git a/base-files/base-files/corgi/hostname b/base-files/base-files/corgi/hostname
deleted file mode 100644
index e69de29bb2..0000000000
--- a/base-files/base-files/corgi/hostname
+++ /dev/null
diff --git a/base-files/base-files/h3600/hostname b/base-files/base-files/h3600/hostname
deleted file mode 100644
index e69de29bb2..0000000000
--- a/base-files/base-files/h3600/hostname
+++ /dev/null
diff --git a/base-files/base-files/hostname b/base-files/base-files/hostname
deleted file mode 100644
index e69de29bb2..0000000000
--- a/base-files/base-files/hostname
+++ /dev/null
diff --git a/base-files/base-files/husky/hostname b/base-files/base-files/husky/hostname
deleted file mode 100644
index e69de29bb2..0000000000
--- a/base-files/base-files/husky/hostname
+++ /dev/null
diff --git a/base-files/base-files/poodle/hostname b/base-files/base-files/poodle/hostname
deleted file mode 100644
index e69de29bb2..0000000000
--- a/base-files/base-files/poodle/hostname
+++ /dev/null
diff --git a/base-files/base-files/ramses/hostname b/base-files/base-files/ramses/hostname
deleted file mode 100644
index c8f3790d7a..0000000000
--- a/base-files/base-files/ramses/hostname
+++ /dev/null
@@ -1 +0,0 @@
-MNCI
diff --git a/base-files/base-files/shepherd/hostname b/base-files/base-files/shepherd/hostname
deleted file mode 100644
index e69de29bb2..0000000000
--- a/base-files/base-files/shepherd/hostname
+++ /dev/null
diff --git a/base-files/base-files/simpad/hostname b/base-files/base-files/simpad/hostname
deleted file mode 100644
index e69de29bb2..0000000000
--- a/base-files/base-files/simpad/hostname
+++ /dev/null
diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index 16d7568a81..d92bb26bd1 100644
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -18,20 +18,15 @@ SRC_URI = " \
            file://etc/host.conf \
            file://etc/profile \
            file://shepherd/fstab \
-           file://shepherd/hostname \
            file://epia/fstab \
-           file://h3600/hostname \
            file://corgi/fstab \
-           file://corgi/hostname \
            file://fstab \
            file://husky/fstab \
-           file://husky/hostname \
            file://share/dot.bashrc \
            file://share/dot.profile \
            file://share/info.dir \
            file://share/motd.md5sums \
            file://collie/fstab \
-           file://collie/hostname \
            file://debian/FAQ \
            file://debian/directory-list \
            file://debian/control \
@@ -47,12 +42,8 @@ SRC_URI = " \
            file://debian/remove-base \
            file://debian/README.base \
            file://debian/current-md5sums \
-           file://hostname \
            file://poodle/fstab \
-           file://poodle/hostname \
            file://ramses/fstab \
-           file://ramses/hostname \
-           file://simpad/hostname \
            file://licenses/BSD \
            file://licenses/GPL-2 \
            file://licenses/LGPL-2 \
@@ -90,7 +81,7 @@ do_install () {
 
     install -d ${D}/${sysconfdir}
     oe_machinstall -m 0644 ${WORKDIR}/fstab ${D}/${sysconfdir}/fstab
-    oe_machinstall -m 0644 ${WORKDIR}/hostname ${D}/${sysconfdir}/hostname
+    echo ${MACHINE} > ${D}/${sysconfdir}/hostname
     oe_machinstall -m 0644 ${WORKDIR}/profile ${D}/${sysconfdir}/profile
     install -m 0644 ${WORKDIR}/etc/issue-${DISTRO} ${D}/${sysconfdir}/issue
     install -m 0644 ${WORKDIR}/etc/issue.net-${DISTRO} ${D}/${sysconfdir}/issue.net