diff options
-rw-r--r-- | conf/distro/openslug-packages.conf | 1 | ||||
-rw-r--r-- | conf/distro/ucslugc-packages.conf | 7 | ||||
-rw-r--r-- | packages/busybox/busybox_1.00.bb | 3 | ||||
-rw-r--r-- | packages/busybox/files/syslog.conf | 4 | ||||
-rw-r--r-- | packages/evince/evince_0.3.2.bb | 2 | ||||
-rw-r--r-- | packages/gpsdrive/gpsdrive_2.10pre3.bb | 2 | ||||
-rw-r--r-- | packages/meta/openslug-packages.bb | 1 | ||||
-rw-r--r-- | packages/meta/ucslugc-packages.bb | 2 | ||||
-rw-r--r-- | packages/perl/perl_5.8.7.bb | 1 | ||||
-rw-r--r-- | packages/scummvm/scummvm.inc | 3 | ||||
-rw-r--r-- | packages/scummvm/scummvm_0.6.1b.bb | 1 | ||||
-rw-r--r-- | packages/wakelan/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/wakelan/wakelan_1.1.bb | 14 |
13 files changed, 29 insertions, 12 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 7255ec5528..e576d83329 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -160,6 +160,7 @@ ${PKGDIR}/packages/update-rc.d/*.bb \ ${PKGDIR}/packages/upslug/*.bb \ ${PKGDIR}/packages/util-linux/*.bb \ ${PKGDIR}/packages/vlan/*.bb \ +${PKGDIR}/packages/wakelan/*.bb \ ${PKGDIR}/packages/wget/*.bb \ ${PKGDIR}/packages/xinetd/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index 6d9dbef8fc..05498dc1c1 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -1,4 +1,4 @@ -# hand editted from bitbake freeze output +# automatically generated by bitbake freeze BBFILES := "\ ${PKGDIR}/packages/atftp/*.bb \ ${PKGDIR}/packages/audiofile/*.bb \ @@ -79,8 +79,6 @@ ${PKGDIR}/packages/lzo/*.bb \ ${PKGDIR}/packages/m4/*.bb \ ${PKGDIR}/packages/make/*.bb \ ${PKGDIR}/packages/makedevs/*.bb \ -${PKGDIR}/packages/man-pages/*.bb \ -${PKGDIR}/packages/man/*.bb \ ${PKGDIR}/packages/meta/*.bb \ ${PKGDIR}/packages/miau/*.bb \ ${PKGDIR}/packages/microcom/*.bb \ @@ -120,7 +118,6 @@ ${PKGDIR}/packages/popt/*.bb \ ${PKGDIR}/packages/portmap/*.bb \ ${PKGDIR}/packages/ppp/*.bb \ ${PKGDIR}/packages/procps/*.bb \ -${PKGDIR}/packages/psmisc/*.bb \ ${PKGDIR}/packages/puppy/*.bb \ ${PKGDIR}/packages/pwc/*.bb \ ${PKGDIR}/packages/python/*.bb \ @@ -131,7 +128,6 @@ ${PKGDIR}/packages/reiserfsprogs/*.bb \ ${PKGDIR}/packages/rsync/*.bb \ ${PKGDIR}/packages/samba/*.bb \ ${PKGDIR}/packages/sane-backends/*.bb \ -${PKGDIR}/packages/screen/*.bb \ ${PKGDIR}/packages/sed/*.bb \ ${PKGDIR}/packages/setpwc/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ @@ -150,6 +146,7 @@ ${PKGDIR}/packages/update-modules/*.bb \ ${PKGDIR}/packages/update-rc.d/*.bb \ ${PKGDIR}/packages/util-linux/*.bb \ ${PKGDIR}/packages/vlan/*.bb \ +${PKGDIR}/packages/wakelan/*.bb \ ${PKGDIR}/packages/wget/*.bb \ ${PKGDIR}/packages/zlib/*.bb \ ${UCSLUGC_EXTRA_BBFILES}" diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index f6d03fe69f..988265d72c 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r29" +PR = "r30" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://add-getkey-applet.patch;patch=1 \ @@ -54,6 +54,7 @@ INITSCRIPT_PACKAGES = "${PN} ${PN}-httpd ${PN}-udhcpd" INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" INITSCRIPT_NAME_${PN} = "syslog" +CONFFILES_${PN} = "${sysconfdir}/syslog.conf" # This disables the syslog startup links in openslug (see openslug-init) INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ." diff --git a/packages/busybox/files/syslog.conf b/packages/busybox/files/syslog.conf index e2a2d58412..d4a0e02f5b 100644 --- a/packages/busybox/files/syslog.conf +++ b/packages/busybox/files/syslog.conf @@ -3,7 +3,7 @@ MARKINT=20 # intervall between --mark-- entries LOGFILE=/var/log/messages # where to log (file) REMOTE=loghost:514 # where to log (syslog remote) REDUCE=no # reduce-size logging -ROTATESIZE=0 # rotate log if grown beyond X [kByte] -ROTATEGENS=3 # keep X generations of rotated logs +#ROTATESIZE=0 # rotate log if grown beyond X [kByte] (incompatible with busybox) +#ROTATEGENS=3 # keep X generations of rotated logs (incompatible with busybox) BUFFERSIZE=64 # size of circular buffer [kByte] FOREGROUND=no # run in foreground (don't use!) diff --git a/packages/evince/evince_0.3.2.bb b/packages/evince/evince_0.3.2.bb index 905ce519b8..86ca664655 100644 --- a/packages/evince/evince_0.3.2.bb +++ b/packages/evince/evince_0.3.2.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Evince is simply a document viewer" LICENSE = "GPL" -DEPENDS = "tiff espgs-native espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" +DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" RDEPENDS = "espgs" RRECOMMENDS = "gnome-vfs-plugin-file" diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb index 0dc0bdbe7d..7d0e32930c 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre3.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre3.bb @@ -1,6 +1,6 @@ inherit autotools pkgconfig -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE="-1" PACKAGES += "gpsdrive-add" diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index a78f71002c..6d16f9039d 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -114,6 +114,7 @@ OPENSLUG_PACKAGES = "\ timezones \ unionfs-modules unionfs-utils \ vlan \ + wakelan \ wget \ xinetd \ yp-tools ypbind ypserv \ diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb index 1244eaa8d3..7074cfff48 100644 --- a/packages/meta/ucslugc-packages.bb +++ b/packages/meta/ucslugc-packages.bb @@ -66,6 +66,7 @@ UCSLUGC_PACKAGES = "\ nano \ ncftp \ ncurses \ + netpbm \ ntp \ obexftp openobex openobex-apps ircp \ openldap \ @@ -98,6 +99,7 @@ UCSLUGC_PACKAGES = "\ unionfs-modules unionfs-utils \ util-linux \ vlan \ + wakelan \ wget \ zlib \ " diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb index b5d25257bb..250c306743 100644 --- a/packages/perl/perl_5.8.7.bb +++ b/packages/perl/perl_5.8.7.bb @@ -1,4 +1,5 @@ MAINTAINER="David Karlstrom <daka@thg.se>" +DEFAULT_PREFERENCE="-1" include perl.inc diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 491dfca9dc..88c6f13d9d 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -4,8 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \ - file://tremor.patch;patch=1 \ - file://mouse.patch;patch=1 " + file://tremor.patch;patch=1" inherit autotools diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb index 8e70acef68..6f805b6b4d 100644 --- a/packages/scummvm/scummvm_0.6.1b.bb +++ b/packages/scummvm/scummvm_0.6.1b.bb @@ -1,5 +1,6 @@ include scummvm.inc DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2" +SRC_URI += " file://mouse.patch;patch=1 " do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ diff --git a/packages/wakelan/.mtn2git_empty b/packages/wakelan/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wakelan/.mtn2git_empty diff --git a/packages/wakelan/wakelan_1.1.bb b/packages/wakelan/wakelan_1.1.bb new file mode 100644 index 0000000000..7f4d66c167 --- /dev/null +++ b/packages/wakelan/wakelan_1.1.bb @@ -0,0 +1,14 @@ +LICENSE = "GPL" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" +DESCRIPTION = "Wakelan sends a magic packet to wake up remote PC's" +PR = "r0" + +FILES = "${bindir}/wakelan" +SRC_URI = "http://www.ibiblio.org/pub/Linux/system/network/misc/${PN}-${PV}.tar.gz" + +inherit autotools + +do_install () { + install -d ${bindir} + install -m 0755 ${WORKDIR}/${PN}-${PV}/wakelan ${D}${bindir}/wakelan +} |