summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--Makefile.x112
-rw-r--r--core/opiealarm/opie-opiealarm.control2
-rwxr-xr-xmkipks6
-rw-r--r--root/opie-windows2000-ppp-scripts.control2
-rw-r--r--root/ptydevs.control2
-rw-r--r--root/timezones.control2
7 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index a42c772..4278d1f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,138 +1,138 @@
indefault: dynamic
all: default docs
LIBS=library libopie
INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \
inputmethods/handwriting inputmethods/unikeyboard \
inputmethods/jumpx inputmethods/kjumpx \
inputmethods/dvorak inputmethods/multikey \
APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
core/applets/irdaapplet core/applets/volumeapplet \
core/applets/clockapplet core/applets/netmonapplet \
core/applets/homeapplet core/applets/suspendapplet \
core/applets/logoutapplet \
core/applets/screenshotapplet core/applets/clipboardapplet \
core/applets/cardmon core/applets/obex \
core/applets/vmemo \
noncore/net/networksetup/interfaces \
noncore/net/networksetup/wlan \
noncore/applets/wirelessapplet noncore/applets/notesapplet
MAIL= noncore/mail/libmail noncore/mail/bend
PLAYER = core/multimedia/opieplayer/libmpeg3 \
core/multimedia/opieplayer/libmad \
core/multimedia/opieplayer/wavplugin \
core/multimedia/opieplayer/modplug
COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER)
PIMAPPS = core/pim/addressbook core/pim/datebook \
core/pim/today core/pim/todo
TODAYPLUGINS = core/pim/today/plugins/datebook \
core/pim/today/plugins/todolist \
core/pim/today/plugins/mail \
noncore/todayplugins/stockticker/stockticker noncore/todayplugins/stockticker/stocktickerlib \
noncore/todayplugins/fortune \
noncore/todayplugins/weather
COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
core/apps/textedit core/apps/embeddedkonsole \
core/launcher \
core/opie-login \
core/apps/oipkg core/apps/qcop
COREMULTIMEDIA = core/multimedia/opieplayer
CORESETTINGS = core/settings/light-and-power core/settings/security \
noncore/settings/netsystemtime core/settings/citytime \
core/settings/launcher
NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \
noncore/settings/appearance2 noncore/settings/sound \
noncore/settings/mediummount \
noncore/settings/tabmanager noncore/settings/appskey \
noncore/settings/sshkeys noncore/settings/usermanager \
noncore/settings/backup
NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm \
noncore/tools/formatter
NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \
noncore/styles/flat noncore/styles/fresh
NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \
noncore/decorations/polished
GAMES = noncore/games/minesweep noncore/games/solitaire \
noncore/games/tetrix noncore/games/wordgame \
noncore/games/parashoot noncore/games/snake \
noncore/games/mindbreaker \
noncore/games/go noncore/games/qasteroids \
noncore/games/fifteen noncore/games/tictac \
noncore/games/kcheckers noncore/games/kpacman \
noncore/games/kbill noncore/games/buzzword \
noncore/games/bounce noncore/games/sfcave
NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
noncore/apps/opie-console noncore/apps/opie-write
NONNET = noncore/net/networksetup \
noncore/net/ftplib noncore/net/opieftp \
noncore/mail
NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
noncore/graphics/qpdf noncore/apps/confedit
NONCOMM = noncore/comm/keypebble
PLUGINS = freetype
APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \
$(COREMULTIMEDIA) $(CORESETTINGS) \
$(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
$(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
$(NONCOMM) $(GAMES) $(TODAYPLUGINS) $(PLUGINS)
-NONTMAKEAPPS := ipaq/opiealarm
+NONTMAKEAPPS := root/opiealarm
DOCS = docs/src/opie-policy
dynamic: $(APPS) $(NONTMAKEAPPS)
docs: $(DOCS)
$(COMPONENTS): $(LIBS)
$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS):
$(MAKE) -C $@ -f Makefile
showcomponents:
@echo $(LIBS) $(APPS) $(COMPONENTS)
clean:
for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
lupdate:
for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
lrelease:
for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
.PHONY: default dynamic $(NONTMAKEAPPS) $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) showcomponents clean
diff --git a/Makefile.x11 b/Makefile.x11
index 4733e10..9aa96da 100644
--- a/Makefile.x11
+++ b/Makefile.x11
@@ -1,132 +1,132 @@
indefault: dynamic
all: default docs
LIBS=x11/libqpe-x11 libopie
INPUTCOMPONENTS= inputmethods/keyboard inputmethods/pickboard \
inputmethods/handwriting inputmethods/unikeyboard \
inputmethods/jumpx inputmethods/kjumpx \
inputmethods/dvorak inputmethods/multikey \
APPLETS= core/applets/batteryapplet core/applets/batteryapplet-ipaq \
core/applets/irdaapplet core/applets/volumeapplet \
core/applets/clockapplet core/applets/netmonapplet \
core/applets/homeapplet core/applets/suspendapplet \
core/applets/logoutapplet \
core/applets/screenshotapplet core/applets/clipboardapplet \
core/applets/cardmon core/applets/obex \
core/applets/vmemo noncore/net/netsetup/dialup \
noncore/net/netsetup/lan \
noncore/applets/wirelessapplet noncore/applets/notesapplet
MAIL= noncore/mail/libmail noncore/mail/bend
PLAYER = core/multimedia/opieplayer/libmpeg3 \
core/multimedia/opieplayer/libmad \
core/multimedia/opieplayer/wavplugin \
core/multimedia/opieplayer/modplug
COMPONENTS=$(LOCALCOMPONENTS) $(INPUTCOMPONENTS) $(APPLETS) $(MAIL) $(PLAYER)
PIMAPPS = core/pim/addressbook core/pim/datebook \
core/pim/today core/pim/todo
TODAYPLUGINS = core/pim/today/plugins/datebook \
core/pim/today/plugins/todolist \
core/pim/today/plugins/mail \
COREAPPS = core/apps/filebrowser core/apps/helpbrowser \
core/apps/textedit core/apps/embeddedkonsole \
core/launcher \
core/opie-login \
core/apps/oipkg core/apps/qcop
COREMULTIMEDIA = core/multimedia/opieplayer
CORESETTINGS = core/settings/light-and-power core/settings/security \
noncore/settings/netsystemtime core/settings/citytime \
core/settings/launcher
NONCORESETTINGS =noncore/settings/language noncore/settings/rotation \
noncore/settings/appearance2 noncore/settings/sound \
noncore/settings/mediummount \
noncore/settings/tabmanager noncore/settings/appskey \
noncore/settings/wlansetup \
noncore/settings/sshkeys noncore/settings/usermanager \
noncore/apps/backup
NONCORETOOLS = noncore/tools/calculator noncore/tools/clock \
noncore/tools/remote noncore/tools/opie-sh noncore/apps/advancedfm
NONCORESTYLES = noncore/styles/liquid noncore/styles/theme noncore/styles/metal \
noncore/styles/flat noncore/styles/fresh
NONCOREDECOS = noncore/decorations/liquid noncore/decorations/flat \
noncore/decorations/polished
GAMES = noncore/games/minesweep noncore/games/solitaire \
noncore/games/tetrix noncore/games/wordgame \
noncore/games/parashoot noncore/games/snake \
noncore/games/mindbreaker \
noncore/games/go noncore/games/qasteroids \
noncore/games/fifteen noncore/games/tictac \
noncore/games/kcheckers noncore/games/kpacman \
noncore/games/kbill noncore/games/buzzword \
noncore/games/bounce
NONAPPS = noncore/apps/opie-sheet noncore/apps/tableviewer \
noncore/apps/opie-reader noncore/apps/checkbook noncore/apps/oxygen \
noncore/apps/sysinfo noncore/net/opieirc noncore/apps/aqpkg \
NONNET = noncore/net/netsetup noncore/net/opieftp \
noncore/mail
NONMULT = noncore/multimedia/showimg noncore/graphics/drawpad \
noncore/graphics/qpdf noncore/apps/confedit
NONCOMM = noncore/comm/keypebble
APPS=$(LOCALAPPS) $(PIMAPPS) $(COREAPPS) \
$(CORESETTINGS) \
$(NONCORESETTINGS) $(NONCORETOOLS) $(NONCORESTYLES) \
$(NONCOREDECOS) $(NONAPPS) $(NONNET) $(NONMULT) \
$(NONCOMM) $(GAMES) $(TODAYPLUGINS)
-NONTMAKEAPPS := ipaq/opiealarm
+NONTMAKEAPPS := root/opiealarm
DOCS = docs/src/opie-policy
single: mpegplayer/libmpeg3
dynamic: $(APPS) $(NONTMAKEAPPS)
docs: $(DOCS)
$(COMPONENTS): $(LIBS)
$(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
$(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single:
$(MAKE) -C $@ -f Makefile
showcomponents:
@echo $(LIBS) $(APPS) $(COMPONENTS) single
clean:
$(MAKE) -C single -f Makefile $@
for dir in $(NONTMAKEAPPS) $(APPS) $(LIBS) $(COMPONENTS) $(DOCS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
lupdate:
for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
lrelease:
for dir in $(APPS) $(LIBS) $(COMPONENTS); do $(MAKE) -C $$dir -f Makefile $@ || exit 1; done
.PHONY: default dynamic $(NONTMAKEAPPS) $(LIBS) $(APPS) $(COMPONENTS) $(DOCS) single showcomponents clean
diff --git a/core/opiealarm/opie-opiealarm.control b/core/opiealarm/opie-opiealarm.control
index b63fa66..5413ba8 100644
--- a/core/opiealarm/opie-opiealarm.control
+++ b/core/opiealarm/opie-opiealarm.control
@@ -1,13 +1,13 @@
-Files: bin/opiealarm bin/opieatd ipaq/etc/init.d/opieatd ipaq/etc/rc2.d/S96opieatd ipaq/etc/suspend-scripts/S46opiealarm ipaq/etc/resume-scripts/R46opiealarm
+Files: bin/opiealarm bin/opieatd root/etc/init.d/opieatd root/etc/rc2.d/S96opieatd root/etc/suspend-scripts/S46opiealarm root/etc/resume-scripts/R46opiealarm
Priority: required
Provides: ipaqalarm
Conflicts: ipaqalarm
Section: opie/system
Maintainer: Robert Griebl <sandman@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
Depends: hotplug
Description: A wakeup system for OPIE events.
Tiny, OPIE specific replacement for ipaqalarm,
uschedule and qpe2uschedule
diff --git a/mkipks b/mkipks
index ca934d8..798e73f 100755
--- a/mkipks
+++ b/mkipks
@@ -1,241 +1,241 @@
#!/bin/sh
QTE_VERSION=2.3.4
DEB_VERSION=2.0
# Have to do this here, since CVS can't store symlinks
mkdir -p $OPIEDIR/etc/rc2.d
ln -sf ../init.d/opie $OPIEDIR/etc/rc2.d/S98opie
mkdir -p $OPIEDIR/etc/rcS.d
ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash
-ln -sf ../init.d/opieatd $OPIEDIR/ipaq/etc/rc2.d/S96opieatd
+ln -sf ../init.d/opieatd $OPIEDIR/root/etc/rc2.d/S96opieatd
VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h)
if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
then
[ -z "$VERSION_CVS" ] && VERSION_CVS="$(date +%Y%m%d)"
SUB_VERSION=$VERSION_CVS
else
VERSION_CVS=""
fi
QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT
ARCH=arm
STRIP=arm-linux-strip
STRIP_FILES="*ARM*not stripped"
TDIR=/tmp/ipk$$
DATADIR=$TDIR
CTRLDIR=$TDIR/CONTROL
IMAGEDIR=
VERB=
LIST=
RPM=
while [ $# -ne 0 ]
do
case "$1" in
-v)
VERB=1
echo >&2 "Packaging for version $VERSION_MAJ.$VERSION_MIN.$VERSION_PAT$VERSION_CVS"
;; -l)
LIST=1
;; -i)
shift
IMAGEDIR=$1
DATADIR=$IMAGEDIR
mkdir -p $IMAGEDIR
;; -classic)
classicopts=-c
;; -rpm)
if [ "$OPIEDIR" != "/opt/Qtopia" ]
then
echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.'
sleep 1
#exit 1
fi
RPM=1
;; -arch)
shift
ARCH=$1
STRIP=
STRIP_FILES=
;; /*)
FILES="$FILES $1"
;; *)
FILES="$FILES $PWD/$1"
esac
shift
done
if [ -z "$FILES" ]
then
FILES=`find $OPIEDIR -name "*.control" -print`
fi
RDIR=$PWD
ORIGDIR=`pwd`
cd $OPIEDIR
for i in $FILES
do
rm -rf $TDIR
mkdir -p $DATADIR
mkdir -p $CTRLDIR
packagename=${i##*/}; packagename=${packagename%.control}
version=$(eval echo '"'$(sed -n -e "s/^Version: *//p" $i)'"')
depends=$(eval echo '"'$(sed -n -e "s/^Depends: *//p" $i)'"')
files=$(eval echo $(sed -n -e "s/^Files://p" $i))
arch=$(eval echo $(sed -n -e "s/^Arch://p" $i))
section=$(sed -n -e "s/^Section: *//p" $i)
provides=$(sed -n -e "s/^Provides: *//p" $i)
conflicts=$(sed -n -e "s/^Conflicts: *//p" $i)
license=$(sed -n -e "s/^License: *//p" $i)
summary=$(sed -n -e "s/^Description: *//p" $i)
package=${packagename}_${version}_$ARCH
ERROR=
if [ -z "$files" ]
then
mkdir -p $DATADIR/usr/share/doc/$packagename
else
for f in $files
do
if [ -d $f ]
then
ffiles=$(find $f -type f -o -type b -o -type c -o -type l)
else
ffiles=$f
fi
for ff in $ffiles
do
case $ff in
*/CVS/*)
continue
;; *~)
continue
;; *.control)
continue
;; $QTDIR/*)
BASE=$(dirname /opt/QtPalmtop/${ff#$QTDIR/})
;; etc/*.d/*)
BASE=$(dirname /$ff)
- ;; ipaq/*)
- BASE=$(dirname ${ff#ipaq})
+ ;; root/*)
+ BASE=$(dirname ${ff#root})
;; *)
# For SHARP ROM compatibility. Should change to Qtopia.
BASE=/opt/QtPalmtop/$(dirname $ff)
esac
if [ -f $ff -o -b $ff -o -c $ff ]
then
D=$DATADIR$BASE
if [ -x $ff -a -n "$STRIP" ]
then
case $(file $ff) in
$STRIP_FILES)
$STRIP $ff
;; *)
esac
fi
if [ -n "$RPM" ]
then
case "$ff" in
/*) RPMFILES="$RPMFILES $ff"
;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff"
esac
else
mkdir -p $D
if cp -a $ff $D
then
true
else
ERROR=1
fi
fi
else
echo >&2 "$0: $i: No such file: $ff"
ERROR=1
fi
done
done
fi
if [ -z "$ERROR" ]
then
if [ -n "$RPM" ]
then
SPEC=/tmp/mkipks-rpm-$$.spec
echo >$SPEC "Summary: $summary"
echo >>$SPEC "Name: $packagename"
echo >>$SPEC "Group: $section" ##########
echo >>$SPEC "License: $license"
echo >>$SPEC "Version: ${version%-*}"
echo >>$SPEC "Release: ${version#*-}"
echo >>$SPEC "%description"
sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC
echo >>$SPEC "%files"
echo >>$SPEC "%defattr(-,root,root)"
/bin/ls $RPMFILES >>$SPEC
rpm -bb --target $ARCH-unknown-linux $SPEC
# rm $SPEC
elif [ -z "$IMAGEDIR" ]
then
#size=$(du -h -s $DATADIR | sed -e 's/[ ].*//')
if (which mkfs.jffs2 >/dev/null 2>&1); then
size=$(mkfs.jffs2 -r $DATADIR | wc -c)
fi
echo "Package: $packagename" >$CTRLDIR/control
if [ ! -z "$size" ]; then
echo "Installed-Size: $size" >>$CTRLDIR/control
else
if [ -z "$SIZEWARNED" ]
then
echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size."
SIZEWARNED=1
fi
fi
echo "Architecture: $ARCH" >>$CTRLDIR/control
echo "Filename: ./$package.ipk" >>$CTRLDIR/control
echo "Version: $version" >>$CTRLDIR/control
[ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control
[ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control
[ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control
egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i
[ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary
base=${i%.control}
scripts="preinst postinst prerm postrm"
for pf in $scripts
do
if [ -x ${base}.$pf ]
then
cp ${base}.$pf $CTRLDIR/$pf
fi
done
cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR;
RESULT=$package.ipk
if [ -n "$VERB" ]
then
echo >&2 "Built $RESULT ($size)"
fi
if [ -n "$LIST" ]
then
echo $RESULT
fi
fi
else
echo >&2 "Not building $package package"
fi
done
# clean up
rm -rf $TDIR
diff --git a/root/opie-windows2000-ppp-scripts.control b/root/opie-windows2000-ppp-scripts.control
index 48249ed..cdd671c 100644
--- a/root/opie-windows2000-ppp-scripts.control
+++ b/root/opie-windows2000-ppp-scripts.control
@@ -1,7 +1,7 @@
-Files: ipaq/etc/hosts ipaq/etc/inittab ipaq/etc/ppp
+Files: root/etc/hosts ipaq/etc/inittab ipaq/etc/ppp
Priority: optional
Section: opie/system
Maintainer: Trenton Schulz <twschulz@trolltech.com>
Architecture: arm
Version: 1.0
Description: PPP configuration file needed for Windows 2000 and syncing
diff --git a/root/ptydevs.control b/root/ptydevs.control
index dbff09f..45b3b6d 100644
--- a/root/ptydevs.control
+++ b/root/ptydevs.control
@@ -1,9 +1,9 @@
-Files: ipaq/dev
+Files: root/dev
Priority: optional
Section: base
Maintainer: Warwick Allison <warwick@trolltech.com>
Version: 1.0.0-5
Architecture: arm
Description: Pseudotty devices
These files are not included in the Familiar libc6 package.
This package contains just a few pty/tty pairs.
diff --git a/root/timezones.control b/root/timezones.control
index c209d7c..43a1579 100644
--- a/root/timezones.control
+++ b/root/timezones.control
@@ -1,9 +1,9 @@
-Files: ipaq/usr/share/zoneinfo
+Files: root/usr/share/zoneinfo
Priority: optional
Section: base
Maintainer: Warwick Allison <warwick@trolltech.com>
Version: 1.0.0-6
Description: Timezone data
These files are not included in the Familiar libc6 package.
This package contains just the non-redundant parts, and uses
about 180K with jffs2.