diff options
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 3 | ||||
| -rw-r--r-- | packages/otpcalc/otpcalc_0.97.bb | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 4bea25a0ed..c16707be84 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -19,6 +19,7 @@ SERIAL_CONSOLE_collie = "115200 ttySA0" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" PCMCIA_MANAGER ?= "pcmciautils" @@ -80,4 +81,4 @@ zaurus_make_installkit () { RDEPENDS_kernel-base = "" # collie is an exception. We use mmc as root, include kernel and use another small kernel to boot it. RDEPENDS_kernel-base_collie = "kernel-image" -KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE ?= "zImage" diff --git a/packages/otpcalc/otpcalc_0.97.bb b/packages/otpcalc/otpcalc_0.97.bb index dd113c9504..baeddd91a9 100644 --- a/packages/otpcalc/otpcalc_0.97.bb +++ b/packages/otpcalc/otpcalc_0.97.bb @@ -3,14 +3,16 @@ DESCRIPTION = "An OTP and S/Key calculator for X" SECTION = "x11" LICENSE = "GPL" DEPENDS = "gtk+ openssl" -PR = "r0" +PR = "r1" + +S = "${WORKDIR}/otpCalc-${PV}" SRC_URI = "http://killa.net/infosec/otpCalc/otpCalc-${PV}.tar.gz \ file://otpcalc-man-table-format.diff;patch=1 \ file://otpcalc-0.97-badindex.diff;patch=1 \ file://otpcalc-crypto-proto.diff;patch=1 \ file://otpcalc-0.97-gtk2-gentoo.patch;patch=1 \ - " + " inherit autotools pkgconfig |