summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Stuehler <uwe@cvs.openbsd.org>2005-07-12 06:33:42 +0000
committerUwe Stuehler <uwe@cvs.openbsd.org>2005-07-12 06:33:42 +0000
commitb296b3f1812596e5d5d6f4452339e681ac7bc36e (patch)
treeeffe84b5e2eee5c76d4d53b252230da2a9b2e644
parent65711feb0423383bbc58255efee1b7cdb9bab2f8 (diff)
Install files in /usr/local instead of /hdd2, so that this package
works on the C3100, too; help and testing niallo@
-rw-r--r--distrib/zaurus/ipk/Makefile12
-rw-r--r--distrib/zaurus/ipk/postinst24
2 files changed, 26 insertions, 10 deletions
diff --git a/distrib/zaurus/ipk/Makefile b/distrib/zaurus/ipk/Makefile
index a6a731a32bf..fd68cfe613b 100644
--- a/distrib/zaurus/ipk/Makefile
+++ b/distrib/zaurus/ipk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2005/03/19 20:23:09 uwe Exp $
+# $OpenBSD: Makefile,v 1.8 2005/07/12 06:33:41 uwe Exp $
TOP= ${.CURDIR}/..
IPK= openbsd${OSrev}_arm.ipk
@@ -6,20 +6,20 @@ IPK= openbsd${OSrev}_arm.ipk
all: ${IPK} Packages
${IPK}:
- install -o ${BINOWN} -g ${BINGRP} -m 755 -d ${.OBJDIR}/data/hdd2/OpenBSD
+ install -o ${BINOWN} -g ${BINGRP} -m 755 -d ${.OBJDIR}/data/usr/local/OpenBSD
install -o ${BINOWN} -g ${BINGRP} -m 755 -d \
${.OBJDIR}/data/opt/QtPalmtop/apps/Applications
install -o ${BINOWN} -g ${BINGRP} -m 755 -d ${.OBJDIR}/data/opt/QtPalmtop/bin
install -o ${BINOWN} -g ${BINGRP} -m 755 -d ${.OBJDIR}/data/opt/QtPalmtop/pics
install -o ${BINOWN} -g ${BINGRP} -m 755 ${.OBJDIR}/../ramdisk/bsd.rd \
- ${.OBJDIR}/data/hdd2/OpenBSD
+ ${.OBJDIR}/data/usr/local/OpenBSD
install -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/mdec/zboot \
- ${.OBJDIR}/data/hdd2/OpenBSD
+ ${.OBJDIR}/data/usr/local/OpenBSD
install -o ${BINOWN} -g ${BINGRP} -m 755 ${DESTDIR}/usr/mdec/zbsdmod.o \
- ${.OBJDIR}/data/hdd2/OpenBSD
+ ${.OBJDIR}/data/usr/local/OpenBSD
install -o ${BINOWN} -g ${BINGRP} -m 755 ${.CURDIR}/rc.zboot \
- ${.OBJDIR}/data/hdd2/OpenBSD
+ ${.OBJDIR}/data/usr/local/OpenBSD
install -o ${BINOWN} -g ${BINGRP} -m 755 ${.CURDIR}/bootbsd \
${.OBJDIR}/data/opt/QtPalmtop/bin
diff --git a/distrib/zaurus/ipk/postinst b/distrib/zaurus/ipk/postinst
index 33854638e34..3e50f36415e 100644
--- a/distrib/zaurus/ipk/postinst
+++ b/distrib/zaurus/ipk/postinst
@@ -1,4 +1,20 @@
#!/bin/sh
+# $OpenBSD: postinst,v 1.4 2005/07/12 06:33:41 uwe Exp $
+#
+# Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
cd /root/etc/rc.d || exit $?
@@ -33,11 +49,11 @@ done
rm -f rc.zboot
rm -f zboot
rm -f zbsdmod.o
-cp /hdd2/OpenBSD/rc.zboot .
-cp /hdd2/OpenBSD/zboot .
-cp /hdd2/OpenBSD/zbsdmod.o .
+cp /usr/local/OpenBSD/rc.zboot .
+cp /usr/local/OpenBSD/zboot .
+cp /usr/local/OpenBSD/zbsdmod.o .
sync; sleep 3
mount -o remount,ro /
-insmod /hdd2/OpenBSD/zbsdmod.o
+insmod /usr/local/OpenBSD/zbsdmod.o