Merge oe-devel@oe-devel.bkbits.net:packages

into odin.sc.ti.com:/home/kergoth/code/packages

2004/11/30 23:37:50+01:00 uni-frankfurt.de!mickeyl
add the forgotten devel feed for 3.5.3

2004/11/30 23:32:38+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/11/30 23:32:28+01:00 uni-frankfurt.de!mickeyl
ship pcre binaries in a different package to get library autorename

2004/11/30 21:30:44+00:00 nexus.co.uk!pb
remove modutils from zaurus-pxa BOOTSTRAP_EXTRA_RDEPENDS

2004/11/30 21:24:47+00:00 nexus.co.uk!pb
turn off CONFIG_PIDOF in busybox due to conflict with sysvinit

2004/11/30 21:07:34+00:00 nexus.co.uk!pb
apply patch to make 'ip route flush [table] cache' work


2004/11/30 19:40:18+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/30 19:39:57+00:00 nexus.co.uk!pb
add patch to correct keycodes reported for simpad buttons


2004/11/30 18:58:46+01:00 handhelds.org!CoreDump
Compensate for changed PATH in OZ 3.5.2

2004/11/30 18:54:01+01:00 uni-frankfurt.de!mickeyl
add glibc-gconv-iso8859-1 to RDEPENDS for qpe-gaim

2004/11/30 16:33:26+00:00 cambridgebroadband.com!rjt
merged

2004/11/30 16:31:05+00:00 cambridgebroadband.com!rjt
xext fixes

2004/11/30 16:29:23+00:00 cambridgebroadband.com!rjt
fixed minimo from current cvs

2004/11/30 16:06:10+01:00 uni-frankfurt.de!mickeyl
add python 2.4 - parallel to python23 at the moment. Will set it to default after the (hopefully coming soon) familiar and opensimpad releases

2004/11/30 15:29:57+01:00 uni-frankfurt.de!mickeyl
if a distro.conf defines DISTRO_NAME and DISTRO_VERSION, use those instead of the fixed version and name from /issue[.net]

2004/11/30 09:39:01+00:00 nexus.co.uk!pb
apply patch from Florian Boor to fix gpe-conf wifi configuration


2004/11/30 09:30:02+00:00 nexus.co.uk!pb
add gpe-theme-foxbox, courtesy Florian Boor


2004/11/30 09:28:59+00:00 nexus.co.uk!pb
generic configuration bits for thin clients


2004/11/30 09:28:16+00:00 nexus.co.uk!pb
add gtk-smooth-engine, courtesy Florian Boor


2004/11/30 09:27:30+00:00 nexus.co.uk!pb
add NetVista support, courtesy Florian Boor


2004/11/30 09:08:24+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/30 09:08:06+00:00 nexus.co.uk!pb
add 2.4.27 kernel for NetVista, courtesy Florian Boor


2004/11/30 09:19:50+01:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into home.hrw.one.pl:/home/hrw/zaurus/oe/packages

2004/11/30 09:19:07+01:00 hrw.one.pl!hrw
tickypip-levels: fixed path and license

2004/11/30 04:35:16+00:00 (none)!cwiiis
Stop using patch in xext that's no longer necessary (and breaks building) - haven't deleted patch in case I've screwed up.

2004/11/30 04:26:49+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into cwiiisdesktop.(none):/home/cwiiis/oe/packages-devel

2004/11/29 21:52:42+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into cwiiisdesktop.(none):/home/cwiiis/oe/packages-devel

2004/11/29 03:39:27+00:00 (none)!cwiiis
Conflict resolution in gpe-image

2004/11/24 13:27:25+00:00 (none)!cwiiis
Add gpe-filemanager to gpe-image for devices with enough memory.

BKrev: 41ad1892Q18BmtD-NGk2dTHnMPrlFQ

2 files changed, 17 insertions, 3 deletions

diff --git a/base-files/base-files/netvista/fstab b/base-files/base-files/netvista/fstab
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/base-files/base-files/netvista/fstab
diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index 054099151f..6f4bef6546 100644
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r18"
+PR = "r19"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -63,12 +63,26 @@ do_install () {
 		echo ${hostname} > ${D}/${sysconfdir}/hostname
 	fi
 
+        if [ -n "${DISTRO_NAME}" ]; then
+		echo -n "${DISTRO_NAME} " > ${D}/${sysconfdir}/issue
+		echo -n "${DISTRO_NAME} " > ${D}/${sysconfdir}/issue.net
+		if [ -n "${DISTRO_VERSION}" ]; then
+			echo -n "${DISTRO_VERSION} " >> ${D}/${sysconfdir}/issue
+			echo -n "${DISTRO_VERSION} " >> ${D}/${sysconfdir}/issue.net
+		fi
+		echo "\n \l" >> ${D}/${sysconfdir}/issue
+		echo >> ${D}/${sysconfdir}/issue
+		echo "%h"    >> ${D}/${sysconfdir}/issue.net
+		echo >> ${D}/${sysconfdir}/issue.net
+	else
+ 	       install -m 0644 ${WORKDIR}/issue ${D}/${sysconfdir}/issue
+ 	       install -m 0644 ${WORKDIR}/issue.net ${D}/${sysconfdir}/issue.net
+ 	fi
+
 	install -m 0644 ${WORKDIR}/fstab ${D}/${sysconfdir}/fstab
 	install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems
 	install -m 0644 ${WORKDIR}/usbd ${D}/${sysconfdir}/default/usbd
 	install -m 0644 ${WORKDIR}/profile ${D}/${sysconfdir}/profile
-	install -m 0644 ${WORKDIR}/issue ${D}/${sysconfdir}/issue
-	install -m 0644 ${WORKDIR}/issue.net ${D}/${sysconfdir}/issue.net
 	install -m 0755 ${WORKDIR}/share/dot.profile ${D}/${sysconfdir}/skel/.profile
 	install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}/${sysconfdir}/skel/.bashrc
 	install -m 0644 ${WORKDIR}/inputrc ${D}/${sysconfdir}/inputrc