summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2003-09-16 20:39:43 +0000
committerChris Larson <clarson@kergoth.com>2003-09-16 20:39:43 +0000
commit1369211ac6cdee1ab8aa64c0020a5d52f8540c39 (patch)
treec9aa37f13989b720619d3de4bd961203b4116fd1 /content
parentd3aa25dd28cb8ae476872f38abf60333712c9cc7 (diff)
Updates to .oe's to utilize the autotools oeclass, and removal of unnecessary 'set -e's now that its default.
BKrev: 3f67750f7hz7fa_5DclmHoTZT7vW3Q
Diffstat (limited to 'content')
-rw-r--r--content/busybox-1.00-pre2.oe3
-rw-r--r--content/busybox-1.00-pre3.oe4
-rw-r--r--content/dropbear-0.36.oe8
-rw-r--r--content/expat-1.95.6.oe4
-rw-r--r--content/fakeroot-0.7.5.oe4
-rw-r--r--content/ifupdown-0.6.4.oe28
-rw-r--r--content/ipkg-0.99.84.oe14
-rw-r--r--content/ipkg-0.99.91.oe13
-rw-r--r--content/ipkg-utils-1.0_cvs.oe4
-rw-r--r--content/iputils-20020927.oe25
-rw-r--r--content/irda-utils-0.9.15.oe4
-rw-r--r--content/jpeg-6b.oe6
-rw-r--r--content/libpng-1.2.5.oe2
-rw-r--r--content/modutils-2.4.25.oe9
-rw-r--r--content/mtd.oe1
-rw-r--r--content/netbase-4.13.oe12
-rw-r--r--content/netkit-base-0.17.oe16
-rw-r--r--content/netkit-ftp-0.17.oe13
-rw-r--r--content/ntp-4.1.2.oe11
-rw-r--r--content/openssh-3.7p1.oe30
-rw-r--r--content/openssl-0.9.7b.oe3
-rw-r--r--content/pcre-4.4.oe1
-rw-r--r--content/qte-2.3.7.oe2
-rw-r--r--content/sysvinit-2.85.oe38
-rw-r--r--content/tinylogin-1.4.oe17
-rw-r--r--content/tslib.oe9
-rw-r--r--content/zlib-1.1.4.oe1
-rw-r--r--content/zsh-4.1.1.oe10
28 files changed, 239 insertions, 53 deletions
diff --git a/content/busybox-1.00-pre2.oe b/content/busybox-1.00-pre2.oe
index d3a87edd61..9e2848fe1e 100644
--- a/content/busybox-1.00-pre2.oe
+++ b/content/busybox-1.00-pre2.oe
@@ -16,19 +16,16 @@ export EXTRA_CFLAGS="${CFLAGS}"
EXTRA_OEMAKE_append=' CROSS=${CROSS}'
do_configure () {
- set -e
install -m 0644 ${FILESDIR}/defconfig ${S}/.config
cml1_do_configure
}
do_compile () {
- set -e
unset CFLAGS
base_do_compile
}
do_install () {
- set -e
install -d ${D}/etc/init.d
oe_runmake 'PREFIX=${D}' install
install -m 0755 ${FILESDIR}/syslog ${D}/etc/init.d/syslog
diff --git a/content/busybox-1.00-pre3.oe b/content/busybox-1.00-pre3.oe
index d3a87edd61..4ca16bf5a3 100644
--- a/content/busybox-1.00-pre3.oe
+++ b/content/busybox-1.00-pre3.oe
@@ -16,19 +16,16 @@ export EXTRA_CFLAGS="${CFLAGS}"
EXTRA_OEMAKE_append=' CROSS=${CROSS}'
do_configure () {
- set -e
install -m 0644 ${FILESDIR}/defconfig ${S}/.config
cml1_do_configure
}
do_compile () {
- set -e
unset CFLAGS
base_do_compile
}
do_install () {
- set -e
install -d ${D}/etc/init.d
oe_runmake 'PREFIX=${D}' install
install -m 0755 ${FILESDIR}/syslog ${D}/etc/init.d/syslog
@@ -36,7 +33,6 @@ do_install () {
}
do_package_ipk_prepend () {
- set -e
install -m 0755 ${FILESDIR}/postinst ${D}/CONTROL/postinst;
install -m 0755 ${FILESDIR}/prerm ${D}/CONTROL/prerm;
}
diff --git a/content/dropbear-0.36.oe b/content/dropbear-0.36.oe
index 0f71a6f158..12c718ca4a 100644
--- a/content/dropbear-0.36.oe
+++ b/content/dropbear-0.36.oe
@@ -1,14 +1,14 @@
DESCRIPTION="Dropbear SSH Implementation"
LICENSE="MIT"
-SRC_URI="http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2"
DEPENDS=virtual/libc zlib ncurses
+SRC_URI="http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2"
S="${WORKDIR}/${P}"
+inherit autotools
+
CFLAGS_append = " -I${S}/libtomcrypt"
LD=${CC}
-do_install () {
- set -e
+do_install_prepend () {
install -d ${D}/usr/sbin ${D}/usr/bin
- oe_runmake DESTDIR=${D} install
}
diff --git a/content/expat-1.95.6.oe b/content/expat-1.95.6.oe
index c0cd17c8b5..fca7bb5147 100644
--- a/content/expat-1.95.6.oe
+++ b/content/expat-1.95.6.oe
@@ -5,8 +5,9 @@ RDEPENDS = libc6
SRC_URI = ${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz
S = "${WORKDIR}/${P}"
+inherit autotools
+
do_stage () {
- set -e
install -m 0644 lib/expat.h ${STAGING_DIR}/target/include/
install -m 0755 .libs/libexpat.so.0.4.0 ${STAGING_LIBDIR}/
ln -sf libexpat.so.0.4.0 ${STAGING_LIBDIR}/libexpat.so.1
@@ -15,7 +16,6 @@ do_stage () {
}
do_install () {
- set -e
oe_runmake prefix="${D}/${prefix}" \
bindir="${D}/${bindir}" \
libdir="${D}/${libdir}" \
diff --git a/content/fakeroot-0.7.5.oe b/content/fakeroot-0.7.5.oe
index e69de29bb2..038b41f0b6 100644
--- a/content/fakeroot-0.7.5.oe
+++ b/content/fakeroot-0.7.5.oe
@@ -0,0 +1,4 @@
+SRC_URI = ${DEBIAN_MIRROR}/main/f/fakeroot/${PN}_${PV}.tar.gz
+S = ${WORKDIR}/${P}
+
+inherit autotools
diff --git a/content/ifupdown-0.6.4.oe b/content/ifupdown-0.6.4.oe
index e69de29bb2..2f30b27565 100644
--- a/content/ifupdown-0.6.4.oe
+++ b/content/ifupdown-0.6.4.oe
@@ -0,0 +1,28 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+DESCRIPTION = High level tools to configure network interfaces\
+ This package provides the tools ifup and ifdown which may be used to\
+ configure (or, respectively, deconfigure) network interfaces, based on\
+ the file /etc/network/interfaces.
+
+SRC_URI = ${DEBIAN_MIRROR}/main/i/${PN}/${PN}_${PV}.orig.tar.gz \
+ ${DEBIAN_MIRROR}/main/i/${PN}/${PN}_${PV}-4.4.diff.gz;patch=1 \
+ file://${FILESDIR}/udhcpc.patch;patch=1
+S = ${WORKDIR}/${P}
+
+EXTRA_OEMAKE =
+
+do_compile () {
+ chmod a+rx *.pl *.sh
+ oe_runmake 'CC=${CC}' "CFLAGS=${CFLAGS} -Wall -W -D'IFUPDOWN_VERSION=\"0.6.4\"'"
+}
+
+do_install () {
+ install -d ${D}/etc/init.d \
+ ${D}/etc/network \
+ ${D}/sbin
+ install -m 0755 ifup ${D}/sbin/
+ ln ${D}/sbin/ifup ${D}/sbin/ifdown
+ install -m 0644 ${FILESDIR}/init ${D}/etc/init.d/init
+ install -m 0644 ${FILESDIR}/interfaces ${D}/etc/network/interfaces
+}
diff --git a/content/ipkg-0.99.84.oe b/content/ipkg-0.99.84.oe
index 71b5a251ec..5095f69d23 100644
--- a/content/ipkg-0.99.84.oe
+++ b/content/ipkg-0.99.84.oe
@@ -1,19 +1,13 @@
DESCRIPTION="Itsy Package Manager"
LICENSE="GPL"
-SRC_URI="cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=V0-99-84"
PROVIDES=virtual/ipkg
DEPENDS=virtual/libc
+SRC_URI="cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=V0-99-84"
S="${WORKDIR}/ipkg/C"
-do_compile () {
- (
- ./autoconfigure.sh && \
- base_do_compile $@
- ) || die "compilation failed."
-}
+inherit autotools
-do_install () {
- set -e
- oe_runmake DESTDIR="${D}" install
+do_compile_prepend () {
+ ./autoconfigure.sh
}
diff --git a/content/ipkg-0.99.91.oe b/content/ipkg-0.99.91.oe
index e69de29bb2..18788b759a 100644
--- a/content/ipkg-0.99.91.oe
+++ b/content/ipkg-0.99.91.oe
@@ -0,0 +1,13 @@
+DESCRIPTION="Itsy Package Manager"
+LICENSE="GPL"
+PROVIDES=virtual/ipkg
+DEPENDS=virtual/libc
+
+SRC_URI="cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=familiar/dist/ipkg;tag=${@'V' + string.replace(oe.data.getVar('PV',d,1), '.', '-')}"
+S="${WORKDIR}/ipkg/C"
+
+inherit autotools
+
+do_compile_prepend () {
+ ./autoconfigure.sh
+}
diff --git a/content/ipkg-utils-1.0_cvs.oe b/content/ipkg-utils-1.0_cvs.oe
index 038f717207..eaad1bf645 100644
--- a/content/ipkg-utils-1.0_cvs.oe
+++ b/content/ipkg-utils-1.0_cvs.oe
@@ -4,11 +4,13 @@ SECTION="base"
PRIORITY="optional"
MAINTAINER="Chris Larson <kergoth@handhelds.org>"
LICENSE="GPL"
-SRC_URI="cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=ipkg-utils"
#DEPENDS=virtual/libc
+SRC_URI="cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=ipkg-utils"
S="${WORKDIR}/${PN}"
+inherit autotools
+
do_stage() {
cp ipkg* ${STAGING_BINDIR}/
}
diff --git a/content/iputils-20020927.oe b/content/iputils-20020927.oe
index e69de29bb2..d5e75a80fe 100644
--- a/content/iputils-20020927.oe
+++ b/content/iputils-20020927.oe
@@ -0,0 +1,25 @@
+SRC_URI = http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz
+S = ${WORKDIR}/${PN}
+
+EXTRA_OEMAKE =
+
+do_compile () {
+ oe_runmake 'CC=${CC}' \
+ KERNEL_INCLUDE="${STAGING_DIR}/target/include" \
+ LIBC_INCLUDE="${STAGING_DIR}/target/include"
+ oe_runmake -C doc 'CC=${CC}' \
+ KERNEL_INCLUDE="${STAGING_DIR}/target/include" \
+ LIBC_INCLUDE="${STAGING_DIR}/target/include"
+}
+
+do_install () {
+ install -d ${D}/bin ${D}/usr/sbin \
+ ${D}/${mandir}/man8 ${D}/${datadir}/doc/${P}
+ install -m 0755 ping ${D}/bin/
+ for f in ipg tracepath clockdiff rdisc arping \
+ tftpd rarpd tracepath6 traceroute6 ping6; do
+ install -m 0755 $f ${D}/usr/sbin/
+ done
+ install -m 0644 doc/*.8 ${D}/${mandir}/man8/
+ install -m 0644 doc/*.html ${D}/${datadir}/doc/${P}/
+}
diff --git a/content/irda-utils-0.9.15.oe b/content/irda-utils-0.9.15.oe
index d946f757f0..be32043981 100644
--- a/content/irda-utils-0.9.15.oe
+++ b/content/irda-utils-0.9.15.oe
@@ -7,14 +7,14 @@ DESCRIPTION = Provides common files needed to use IrDA.\
SRC_URI = ${SOURCEFORGE_MIRROR}/irda/${P}.tar.gz
S = ${WORKDIR}/${P}
+inherit autotools
+
do_compile () {
- set -e
oe_runmake -C irattach
oe_runmake -C irdaping
}
do_install () {
- set -e
install -d ${D}/usr/sbin
oe_runmake -C irattach ROOT="${D}" install
oe_runmake -C irdaping ROOT="${D}" install
diff --git a/content/jpeg-6b.oe b/content/jpeg-6b.oe
index 755f9a278a..73560b2ec8 100644
--- a/content/jpeg-6b.oe
+++ b/content/jpeg-6b.oe
@@ -1,14 +1,15 @@
-DESCRIPTION="Zlib Compression Library"
SECTION="libs"
PRIORITY="required"
MAINTAINER="Chris Larson <kergoth@handhelds.org>"
RDEPENDS="libc6"
+DEPENDS=virtual/libc
SRC_URI = http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
file://${FILESDIR}/debian.patch;patch=1
-DEPENDS=virtual/libc
S=${WORKDIR}/jpeg-${PV}
+inherit autotools
+
EXTRA_OECONF="--enable-static --enable-shared"
# this libtool cant handle the multiword gcc
@@ -29,7 +30,6 @@ do_stage() {
}
do_install() {
- set -e
install -d ${D}/${bindir} ${D}/${includedir} \
${D}/${mandir}/man1 ${D}/${libdir}
oe_runmake 'prefix=${D}/${prefix}' 'exec_prefix=${D}/${exec_prefix}' \
diff --git a/content/libpng-1.2.5.oe b/content/libpng-1.2.5.oe
index 52787b63d5..a018bcf9af 100644
--- a/content/libpng-1.2.5.oe
+++ b/content/libpng-1.2.5.oe
@@ -12,7 +12,6 @@ S = ${WORKDIR}/${P}
EXTRA_OEMAKE_append=' ZLIBINC=${STAGING_DIR}/target/include ZLIBLIB=${STAGING_LIBDIR}'
do_compile() {
- set -e
sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
unset LDFLAGS
oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
@@ -32,7 +31,6 @@ do_stage() {
}
do_install () {
- set -e
install -d ${D}/${bindir} ${D}/${mandir} \
${D}/${libdir} ${D}/${includedir}
unset LDFLAGS
diff --git a/content/modutils-2.4.25.oe b/content/modutils-2.4.25.oe
index e69de29bb2..a6caef4499 100644
--- a/content/modutils-2.4.25.oe
+++ b/content/modutils-2.4.25.oe
@@ -0,0 +1,9 @@
+SRC_URI = ftp://ftp.kernel.org/pub/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2 \
+ file://${FILESDIR}/modutils-notest.patch;patch=1
+S = ${WORKDIR}/${P}
+
+inherit autotools
+
+EXTRA_OECONF = --disable-strip
+EXTRA_OEMAKE =
+export BUILDCC = ${BUILD_CC}
diff --git a/content/mtd.oe b/content/mtd.oe
index 87988871ff..467a884dd1 100644
--- a/content/mtd.oe
+++ b/content/mtd.oe
@@ -9,7 +9,6 @@ CPPFLAGS_prepend = "-I${S}/../include "
CXXFLAGS_prepend = "-I${S}/../include "
do_install () {
- set -e
install -d ${D}/usr/bin
for binary in ftl_format erase eraseall nanddump doc_loadbios \
mkfs.jffs ftl_check mkfs.jffs2 lock unlock einfo mtd_debug \
diff --git a/content/netbase-4.13.oe b/content/netbase-4.13.oe
index e69de29bb2..6218e757cd 100644
--- a/content/netbase-4.13.oe
+++ b/content/netbase-4.13.oe
@@ -0,0 +1,12 @@
+SRC_URI = ${DEBIAN_MIRROR}/main/n/${PN}/${PN}_${PV}.tar.gz
+S = ${WORKDIR}/${P}
+
+do_install () {
+ install -d ${D}/etc/init.d ${D}/${sbindir} ${D}/${mandir}/man8
+ install -m 0644 ${FILESDIR}/init ${D}/etc/init.d/netbase
+ install -m 0644 etc-rpc ${D}/etc/rpc
+ install -m 0644 etc-protocols ${D}/etc/protocols
+ install -m 0644 etc-services ${D}/etc/services
+ install -m 0755 update-inetd ${D}/${sbindir}/
+ install -m 0644 update-inetd.8 ${D}/${mandir}/man8/
+}
diff --git a/content/netkit-base-0.17.oe b/content/netkit-base-0.17.oe
index e69de29bb2..53b9e8974e 100644
--- a/content/netkit-base-0.17.oe
+++ b/content/netkit-base-0.17.oe
@@ -0,0 +1,16 @@
+SRC_URI = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz \
+ file://${FILESDIR}/configure.patch;patch=1 \
+ file://${FILESDIR}/mconfig.patch;patch=1
+S = ${WORKDIR}/${P}
+
+EXTRA_OEMAKE = -C inetd
+do_compile () {
+ oe_runmake 'CC=${CC}' 'LD=${LD}' all
+}
+
+do_install () {
+ install -d ${D}/${sysconfdir}/init.d ${D}/${sbindir}
+ install -m 0755 inetd/inetd ${D}/${sbindir}/inetd
+ install -m 0755 ${FILESDIR}/init ${D}/${sysconfdir}/init.d/inetd
+ install -m 0644 ${FILESDIR}/inetd.conf ${D}/${sysconfdir}
+}
diff --git a/content/netkit-ftp-0.17.oe b/content/netkit-ftp-0.17.oe
index e69de29bb2..c77ffa01be 100644
--- a/content/netkit-ftp-0.17.oe
+++ b/content/netkit-ftp-0.17.oe
@@ -0,0 +1,13 @@
+SRC_URI = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz \
+ file://${FILESDIR}/mconfig.patch;patch=1
+S = ${WORKDIR}/${P}
+
+EXTRA_OEMAKE =
+do_compile () {
+ oe_runmake 'CC=${CC}' 'LD=${LD}' all
+}
+
+do_install () {
+ install -d ${D}/${bindir}
+ install -m 0755 ftp/ftp ${D}/${bindir}
+}
diff --git a/content/ntp-4.1.2.oe b/content/ntp-4.1.2.oe
index e69de29bb2..d66287d7a2 100644
--- a/content/ntp-4.1.2.oe
+++ b/content/ntp-4.1.2.oe
@@ -0,0 +1,11 @@
+DEPENDS = virtual/libc
+
+SRC_URI = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz
+S = ${WORKDIR}/${P}
+
+inherit autotools
+
+EXTRA_OEMAKE =
+EXTRA_OECONF = --with-openssl-libdir=${STAGING_LIBDIR} \
+ --with-openssl-incdir=${STAGING_DIR}/target/include/openssl
+CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
diff --git a/content/openssh-3.7p1.oe b/content/openssh-3.7p1.oe
index e69de29bb2..d2a118e730 100644
--- a/content/openssh-3.7p1.oe
+++ b/content/openssh-3.7p1.oe
@@ -0,0 +1,30 @@
+DEPENDS = virtual/libc zlib openssl
+SECTION = net
+DESCRIPTION = Secure rlogin/rsh/rcp/telnet replacement (OpenSSH)\
+ Ssh (Secure Shell) is a program for logging into a remote machine\
+ and for executing commands on a remote machine.\
+ It provides secure encrypted communications between two untrusted\
+ hosts over an insecure network. X11 connections and arbitrary TCP/IP\
+ ports can also be forwarded over the secure channel.\
+ It is intended as a replacement for rlogin, rsh and rcp, and can be\
+ used to provide applications with a secure communication channel.
+
+SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
+ file://${FILESDIR}/cross.patch;patch=1 \
+ file://${FILESDIR}/scp-nossl.patch;patch=1
+S = ${WORKDIR}/${P}
+
+inherit autotools
+
+export sysconfdir = /etc/ssh
+export ASKPASS_PROGRAM = /usr/bin/ssh-askpass
+export LD = ${CC}
+CFLAGS_prepend = "-I${S} "
+CFLAGS_append = " -D__FILE_OFFSET_BITS=64"
+LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat "
+EXTRA_OECONF = --disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
+ --with-rand-helper=no
+
+do_compile_append () {
+ install -m 0644 ${FILESDIR}/sshd_config ${S}/
+}
diff --git a/content/openssl-0.9.7b.oe b/content/openssl-0.9.7b.oe
index f263368862..719e7d4d38 100644
--- a/content/openssl-0.9.7b.oe
+++ b/content/openssl-0.9.7b.oe
@@ -11,7 +11,6 @@ export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDI
export DIRS = "crypto ssl"
export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
do_compile () {
- set -e
perl util/perlpath.pl /usr/bin
perl ./Configure shared --prefix=/usr --openssldir=/usr/lib/ssl linux-elf-arm
ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
@@ -19,7 +18,6 @@ do_compile () {
}
do_stage () {
- set -e
cp --dereference -R include/openssl ${STAGING_DIR}/target/include/
install -m 0755 libcrypto.so.0.9.7 ${STAGING_LIBDIR}/
ln -sf libcrypto.so.0.9.7 ${STAGING_LIBDIR}/libcrypto.so
@@ -28,6 +26,5 @@ do_stage () {
}
do_install () {
- set -e
oe_runmake -f Makefile.ssl INSTALL_PREFIX="${D}" install
}
diff --git a/content/pcre-4.4.oe b/content/pcre-4.4.oe
index 529465152e..27e1ebce6e 100644
--- a/content/pcre-4.4.oe
+++ b/content/pcre-4.4.oe
@@ -23,7 +23,6 @@ do_compile () {
}
do_stage () {
- set -e
install -m 0755 .libs/libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/
ln -sf libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/libpcreposix.so.0
install -m 0755 .libs/libpcre.so.0.0.1 ${STAGING_LIBDIR}/
diff --git a/content/qte-2.3.7.oe b/content/qte-2.3.7.oe
index 76b88a71d9..bd74b250c0 100644
--- a/content/qte-2.3.7.oe
+++ b/content/qte-2.3.7.oe
@@ -38,13 +38,11 @@ export SYSCONF_LFLAGS = ${LDFLAGS}
do_compile() {
unset CC CXX LD LINK CPP CFLAGS CXXFLAGS LDFLAGS
- set -e
if [ "$BUILD_ARCH" = "i686" ]; then
BUILD_ARCH=x86
fi
echo yes | ./configure -platform $BUILD_OS-$BUILD_ARCH-g++ $EXTRA_OECONF || die "Configuring qt failed"
(
- set -e
cd src/moc
export SYSCONF_CXX="${BUILD_CXX}"
export SYSCONF_CC="${BUILD_CC}"
diff --git a/content/sysvinit-2.85.oe b/content/sysvinit-2.85.oe
index e69de29bb2..04c2045803 100644
--- a/content/sysvinit-2.85.oe
+++ b/content/sysvinit-2.85.oe
@@ -0,0 +1,38 @@
+DEPENDS=virtual/libc
+DESCRIPTION = System-V like init.\
+ Init is the first program to run after your system is booted, and\
+ continues to run as process number 1 until your system halts. Inits\
+ job is to start other programs that are essential to the operation of\
+ your system. All processes are descended from init. For more information,\
+ see the manual page init(8).
+
+SRC_URI = ftp://ftp.cistron.nl/pub/people/miquels/${PN}/${P}.tar.gz
+S="${WORKDIR}/${P}/src"
+
+CFLAGS_prepend = "-D_GNU_SOURCE "
+export LCRYPT = "-lcrypt"
+
+do_install () {
+ install -d ${D}/{usr/{,s}bin,sbin,etc/{default,init.d}}
+# install -m 755 debian/sysv-rc/sbin/invoke-rc.d \
+# debian/sysv-rc/sbin/update-rc.d ${D}/usr/sbin/
+ install -m 755 halt killall5 \
+ runlevel shutdown ${D}/sbin/
+ install -m 755 init ${D}/sbin/sysvinit
+ install -m 755 mesg last ${D}/usr/bin/
+ install -m 0755 ${FILESDIR}/need ${D}/sbin/need.sysvinit
+ install -m 0755 ${FILESDIR}/provide ${D}/sbin/provide.sysvinit
+ ln -sf halt ${D}/sbin/reboot
+ ln -sf halt ${D}/sbin/poweroff
+ ln -sf init ${D}/sbin/telinit
+ ln -sf killall5 ${D}/sbin/pidof
+ ln -sf last ${D}/usr/bin/lastb
+# echo "/etc/inittab" > ${D}/CONTROL/conffiles
+# echo "/etc/default/rcS" >> ${D}/CONTROL/conffiles
+# install -m 0755 ${FILESDIR}/prerm ${D}/CONTROL/
+# install -m 0755 ${FILESDIR}/postinst ${D}/CONTROL/
+ install -m 0644 ${FILESDIR}/inittab ${D}/etc/inittab
+ install -m 0644 ${FILESDIR}/rcS-default ${D}/etc/default/rcS
+ install -m 0755 ${FILESDIR}/rc ${D}/etc/init.d
+ install -m 0755 ${FILESDIR}/rcS ${D}/etc/init.d
+}
diff --git a/content/tinylogin-1.4.oe b/content/tinylogin-1.4.oe
index e69de29bb2..3c1e111f16 100644
--- a/content/tinylogin-1.4.oe
+++ b/content/tinylogin-1.4.oe
@@ -0,0 +1,17 @@
+SRC_URI = http://tinylogin.busybox.net/downloads/${P}.tar.bz2
+S = ${WORKDIR}/${P}
+
+EXTRA_OEMAKE =
+
+do_compile () {
+ oe_runmake 'CC=${CC}' 'CROSS=${CROSS}'
+}
+
+do_install () {
+ install -d ${D}/bin
+ install -m 4755 tinylogin ${D}/bin/tinylogin
+ for i in `cat tinylogin.links`; do
+ mkdir -p ${D}/`dirname $i`
+ ln -sf /bin/tinylogin ${D}/$i
+ done
+}
diff --git a/content/tslib.oe b/content/tslib.oe
index e8beb09bda..b882e3c6aa 100644
--- a/content/tslib.oe
+++ b/content/tslib.oe
@@ -8,12 +8,12 @@ SRC_URI_append = " file://${FILESDIR}/multievent.patch;patch=1"
SRC_URI_append = " file://${FILESDIR}/envvar_doc.patch;patch=1"
#SRC_URI_append = " file://${FILESDIR}/raw.patch;patch=1"
#SRC_URI_append = " file://${FILESDIR}/collie-module.patch;patch=1"
-
S = ${WORKDIR}/${PN}
+inherit autotools
+
EXTRA_OEMAKE=
do_compile_prepend () {
- set -e
./autogen.sh
}
@@ -25,8 +25,3 @@ do_stage () {
install -m 0644 src/tslib.h ${STAGING_DIR}/target/include/
install -m 0644 src/tslib-private.h ${STAGING_DIR}/target/include/
}
-
-do_install () {
- set -e
- oe_runmake DESTDIR="${D}" install
-}
diff --git a/content/zlib-1.1.4.oe b/content/zlib-1.1.4.oe
index 5c738347f4..178874367f 100644
--- a/content/zlib-1.1.4.oe
+++ b/content/zlib-1.1.4.oe
@@ -14,7 +14,6 @@ export CFLAGS:="-fPIC ${CFLAGS}"
export AR:="${AR} rc"
do_compile() {
- set -e
./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
oe_runmake libz.so.1.1.4 libz.a
}
diff --git a/content/zsh-4.1.1.oe b/content/zsh-4.1.1.oe
index 5778214907..9194f09a18 100644
--- a/content/zsh-4.1.1.oe
+++ b/content/zsh-4.1.1.oe
@@ -3,16 +3,12 @@ SECTION="base"
PRIORITY="optional"
MAINTAINER="Chris Larson <kergoth@handhelds.org>"
RDEPENDS="libc6"
+DEPENDS=virtual/libc ncurses pcre
SRC_URI="http://www.zsh.org/pub/${P}.tar.bz2"
-DEPENDS=virtual/libc ncurses pcre
S="${WORKDIR}/${P}"
+inherit autotools
+
EXTRA_OECONF = "--with-curses-terminfo"
-#EXTRA_OECONF = "--with-curses-terminfo --enable-libs='-lncurses'"
EXTRA_OEMAKE =
-
-do_install () {
- set -e
- oe_runmake DESTDIR=${D} install
-}