diff options
| -rw-r--r-- | conf/distro/openslug-packages.conf | 2 | ||||
| -rw-r--r-- | packages/libol/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/libol/libol_0.3.16.bb | 17 | ||||
| -rw-r--r-- | packages/meta/openslug-packages.bb | 1 | ||||
| -rwxr-xr-x | packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling | 23 | ||||
| -rw-r--r-- | packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb | 2 | ||||
| -rw-r--r-- | packages/ssmtp/ssmtp_2.61.bb | 4 | ||||
| -rw-r--r-- | packages/syslog-ng/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/syslog-ng/syslog-ng_1.6.8.bb | 16 |
9 files changed, 57 insertions, 8 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 1411e42bf3..6c76c86780 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -77,6 +77,7 @@ ${PKGDIR}/packages/liblockfile/*.bb \ ${PKGDIR}/packages/libmad/*.bb \ ${PKGDIR}/packages/libmikmod/*.bb \ ${PKGDIR}/packages/libogg/*.bb \ +${PKGDIR}/packages/libol/*.bb \ ${PKGDIR}/packages/libpcap/*.bb \ ${PKGDIR}/packages/libpng/*.bb \ ${PKGDIR}/packages/libtiff/*.bb \ @@ -161,6 +162,7 @@ ${PKGDIR}/packages/strace/*.bb \ ${PKGDIR}/packages/streamripper/*.bb \ ${PKGDIR}/packages/sudo/*.bb \ ${PKGDIR}/packages/sysfsutils/*.bb \ +${PKGDIR}/packages/syslog-ng/*.bb \ ${PKGDIR}/packages/sysvinit/*.bb \ ${PKGDIR}/packages/tar/*.bb \ ${PKGDIR}/packages/thttpd/*.bb \ diff --git a/packages/libol/.mtn2git_empty b/packages/libol/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libol/.mtn2git_empty diff --git a/packages/libol/libol_0.3.16.bb b/packages/libol/libol_0.3.16.bb new file mode 100644 index 0000000000..6c1e87308b --- /dev/null +++ b/packages/libol/libol_0.3.16.bb @@ -0,0 +1,17 @@ +PR = "r3" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" +DEPENDS = "libol-native" + +SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${PN}-${PV}.tar.gz" + +S = "${WORKDIR}/${PN}-${PV}" +inherit autotools + +do_stage() { + install -d ${STAGING_INCDIR}/libol + install -m 0644 ${S}/libol-config ${STAGING_BINDIR} + install -m 0644 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR} + ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0 + install ${S}/src/*.h ${STAGING_INCDIR}/libol/ +} + diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index cdd10e7646..a90ad4cf8f 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -104,6 +104,7 @@ OPENSLUG_PACKAGES = "\ strace \ streamripper \ sudo \ + syslog-ng \ sysfsutils \ tar \ thttpd \ diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling index ce2e528c92..bed1789a6f 100755 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling @@ -11,9 +11,11 @@ fi if [ $# -eq 1 ] ; then if [ "$1" = "disk1" ] ; then + mtch="/dev/sdb1 /share/hdd/data ext3 rw 0 0" targ=/share/hdd/data flag=.sda1root elif [ "$1" = "disk2" ] ; then + mtch="/dev/sda1 /share/flash/data ext3 rw 0 0" targ=/share/flash/data flag=.sdb1root else @@ -27,11 +29,22 @@ fi # Check it's a real mount point -if grep $targ /proc/mounts >/dev/null 2>&1 ; then - echo "Target disk is $targ" -else - echo "Error: $targ is not a mounted disk" - exit 1 +echo "Waiting for $targ" +CNT=120 +while [ $CNT -gt 0 ] +do + if grep "$mtch" /proc/mounts >/dev/null 2>&1 ; then + echo "Target disk is $targ" + CNT=-1 + else + echo -ne "\r$CNT " + sleep 1 + CNT=`expr $CNT - 1` + fi +done +if [ $CNT -eq 0 ] ; then + echo "Error: $targ is not a mounted disk" + exit 1 fi # Start at the root directory diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb index 37d561013f..2f2e5e1866 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb @@ -1,6 +1,6 @@ SECTION = "base" -PR = "r2" +PR = "r3" DEPENDS = "nslu2-linksys-libs" diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb index c48c48ae56..425f7a607b 100644 --- a/packages/ssmtp/ssmtp_2.61.bb +++ b/packages/ssmtp/ssmtp_2.61.bb @@ -3,7 +3,7 @@ MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" DEPENDS = "openssl" DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub." LICENCE = "GPL" -PR = "r4" +PR = "r5" SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \ file://ldflags.patch;patch=1 \ @@ -12,7 +12,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \ file://ssmtp.conf" S = "${WORKDIR}/${PN}-2.61" LICENSE = "GPL" -#CONFFILES = "${sysconfdir}/ssmtp/ssmtp.conf ${sysconfdir}/ssmtp/revaliases" +CONFFILES_${PN} = "${sysconfdir}/ssmtp/ssmtp.conf ${sysconfdir}/ssmtp/revaliases" inherit autotools EXTRA_OECONF = "--enable-ssl" diff --git a/packages/syslog-ng/.mtn2git_empty b/packages/syslog-ng/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/syslog-ng/.mtn2git_empty diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb new file mode 100644 index 0000000000..25a58ad6ef --- /dev/null +++ b/packages/syslog-ng/syslog-ng_1.6.8.bb @@ -0,0 +1,16 @@ +PR = "r3" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" + +SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz" + +S = "${WORKDIR}/${PN}-${PV}" +inherit autotools + +EXTRA_OECONF = "--with-libol=${STAGING_BINDIR}/" +CONFFILES_${PN} = "${sysconfdir}/${PN}/syslog-ng.conf" + +do_install_append() { + install -d ${D}/${sysconfdir}/${PN} + install ${S}/doc/syslog-ng.conf.sample ${D}${sysconfdir}/${PN}/syslog-ng.conf + +} |