summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/libsm/libsm_cvs.bb2
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/15-jffs2-endian-config.patch12
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/65-loft-config.patch84
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/defconfig6
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.15.bb3
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-blueping.inc15
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb23
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb22
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-dummy.inc14
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb23
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb22
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-notice.inc13
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb22
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb21
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-pin.inc15
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb26
-rw-r--r--packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb23
-rw-r--r--packages/opie-securityplugins/opie-securityplugin.inc8
-rw-r--r--packages/opie-securityplugins/opie-securityplugins.inc0
-rw-r--r--packages/opie-securityplugins/opie-securityplugins_1.2.1.bb4
-rw-r--r--packages/opie-securityplugins/opie-securityplugins_cvs.bb4
21 files changed, 182 insertions, 180 deletions
diff --git a/packages/libsm/libsm_cvs.bb b/packages/libsm/libsm_cvs.bb
index c94637c344..ff5fcd8c0e 100644
--- a/packages/libsm/libsm_cvs.bb
+++ b/packages/libsm/libsm_cvs.bb
@@ -6,6 +6,8 @@ DEPENDS = "x11 ice"
DESCRIPTION = "Session management library"
PR = "r1"
+DEFAULT_PREFERENCE="-1"
+
SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=SM"
S = "${WORKDIR}/SM"
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/15-jffs2-endian-config.patch b/packages/linux/ixp4xx-kernel/2.6.15/15-jffs2-endian-config.patch
index fdebb652a7..76e9c7e439 100644
--- a/packages/linux/ixp4xx-kernel/2.6.15/15-jffs2-endian-config.patch
+++ b/packages/linux/ixp4xx-kernel/2.6.15/15-jffs2-endian-config.patch
@@ -1,3 +1,15 @@
+This patch allows the endianness of the JFSS2 filesystem to be
+specified by config options.
+
+It defaults to native-endian (the previously hard-coded option).
+
+Some architectures (in particular, the NSLU2) benefit from having a
+single known endianness of JFFS2 filesystem (for data, not
+executables) independent of the endianness of the processor (ARM
+processors can be switched to either endianness at run-time).
+
+Signed-off-by: Rod Whitby <rod@whitby.id.au>
+
--- linux-2.6.15/fs/Kconfig~ 2006-01-03 13:51:10.000000000 +1030
+++ linux-2.6.15/fs/Kconfig 2006-01-05 01:35:36.000000000 +1030
@@ -1132,6 +1132,31 @@ config JFFS2_CMODE_SIZE
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/65-loft-config.patch b/packages/linux/ixp4xx-kernel/2.6.15/65-loft-config.patch
new file mode 100644
index 0000000000..c6b0c7c679
--- /dev/null
+++ b/packages/linux/ixp4xx-kernel/2.6.15/65-loft-config.patch
@@ -0,0 +1,84 @@
+support for the Giant Shoulder Inc Loft board - a very minor
+variation on a standard Avila board
+
+--- linux-2.6.15/arch/arm/mach-ixp4xx/Kconfig 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.15/arch/arm/mach-ixp4xx/Kconfig 1970-01-01 00:00:00.000000000 +0000
+@@ -25,6 +25,12 @@ config ARCH_AVILA
+ Avila Network Platform. For more information on this platform,
+ see <file:Documentation/arm/IXP4xx>.
+
++config MACH_LOFT
++ bool "Loft"
++ help
++ Say 'Y' here if you want your kernel to support the Giant
++ Shoulder Inc Loft board.
++
+ config ARCH_ADI_COYOTE
+ bool "Coyote"
+ help
+@@ -85,7 +91,7 @@ config MACH_NAS100D
+ #
+ config ARCH_IXDP4XX
+ bool
+- depends on ARCH_IXDP425 || ARCH_AVILA || MACH_IXDP465
++ depends on ARCH_IXDP425 || ARCH_AVILA || MACH_IXDP465 || MACH_LOFT
+ default y
+
+ #
+--- linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-pci.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-pci.c 1970-01-01 00:00:00.000000000 +0000
+@@ -51,7 +51,8 @@ static int __init ixdp425_map_irq(struct
+
+ int irq = -1;
+
+- if (slot >= 1 && slot <= IXDP425_PCI_MAX_DEV &&
++ if (slot >= 1 &&
++ slot <= (machine_is_loft() ? LOFT_PCI_MAX_DEV : IXDP425_PCI_MAX_DEV) &&
+ pin >= 1 && pin <= IXDP425_PCI_IRQ_LINES) {
+ irq = pci_irq_table[(slot + pin - 2) % 4];
+ }
+@@ -71,7 +72,8 @@ struct hw_pci ixdp425_pci __initdata = {
+ int __init ixdp425_pci_init(void)
+ {
+ if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
+- machine_is_avila() || machine_is_ixdp465())
++ machine_is_avila() || machine_is_ixdp465() ||
++ machine_is_loft())
+ pci_common_init(&ixdp425_pci);
+ return 0;
+ }
+--- linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000
+@@ -185,3 +185,22 @@ MACHINE_START(AVILA, "Gateworks Avila Ne
+ MACHINE_END
+ #endif
+
++/*
++ * Loft is functionally equivalent to Avila except that it has a
++ * different number for the maximum PCI devices. The MACHINE
++ * structure below is identical to Avila except for the comment.
++ */
++#ifdef CONFIG_MACH_LOFT
++MACHINE_START(LOFT, "Giant Shoulder Inc Loft board")
++ /* Maintainer: Tom Billman <kernel@giantshoulderinc.com> */
++ .phys_ram = PHYS_OFFSET,
++ .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
++ .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
++ .map_io = ixp4xx_map_io,
++ .init_irq = ixp4xx_init_irq,
++ .timer = &ixp4xx_timer,
++ .boot_params = 0x0100,
++ .init_machine = ixdp425_init,
++MACHINE_END
++#endif
++
+--- linux-2.6.15/include/asm-arm/arch-ixp4xx/ixdp425.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.15/include/asm-arm/arch-ixp4xx/ixdp425.h 1970-01-01 00:00:00.000000000 +0000
+@@ -26,6 +26,7 @@
+ * IXDP425 PCI IRQs
+ */
+ #define IXDP425_PCI_MAX_DEV 4
++#define LOFT_PCI_MAX_DEV 6
+ #define IXDP425_PCI_IRQ_LINES 4
+
+
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/defconfig b/packages/linux/ixp4xx-kernel/2.6.15/defconfig
index ff69ccc6f1..c05034de19 100644
--- a/packages/linux/ixp4xx-kernel/2.6.15/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.15/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.15
-# Sun Jan 8 02:47:26 2006
+# Thu Jan 12 17:44:50 2006
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -113,12 +113,14 @@ CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
#
CONFIG_MACH_NSLU2=y
# CONFIG_ARCH_AVILA is not set
+CONFIG_MACH_LOFT=y
# CONFIG_ARCH_ADI_COYOTE is not set
# CONFIG_ARCH_IXDP425 is not set
# CONFIG_MACH_IXDPG425 is not set
# CONFIG_MACH_IXDP465 is not set
# CONFIG_ARCH_PRPMC1100 is not set
CONFIG_MACH_NAS100D=y
+CONFIG_ARCH_IXDP4XX=y
# CONFIG_MACH_GTWX5715 is not set
#
@@ -177,7 +179,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f noirqdebug console=ttyS0,115200n8"
+CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f rtc-ds1672.probe=0,0x68 rtc-ds1672.hctosys=1 pcf8563.hctosys=1 noirqdebug console=ttyS0,115200n8"
# CONFIG_XIP_KERNEL is not set
#
diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.bb
index 39ad707916..4a7cd96d37 100644
--- a/packages/linux/ixp4xx-kernel_2.6.15.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.15.bb
@@ -8,7 +8,7 @@ PR_CONFIG = "0"
# Increment the number below (i.e. the digits after PR) when
# making changes within this file or for changes to the patches
# applied to the kernel.
-PR = "r3.${PR_CONFIG}"
+PR = "r4.${PR_CONFIG}"
include ixp4xx-kernel.inc
@@ -25,6 +25,7 @@ IXP4XX_PATCHES += "file://60-nas100d-i2c.patch;patch=1"
# IXP4XX_PATCHES += "file://60-nas100d-ide.patch;patch=1"
IXP4XX_PATCHES += "file://60-nas100d-rtc.patch;patch=1"
IXP4XX_PATCHES += "file://60-nslu2-beeper.patch;patch=1"
+IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1"
# IXP4XX_PATCHES += "file://75-nslu2-leds.patch;patch=1"
IXP4XX_PATCHES += "file://80-nslu2-io.patch;patch=1"
IXP4XX_PATCHES += "file://85-timer.patch;patch=1"
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping.inc b/packages/opie-securityplugins/opie-securityplugin-blueping.inc
new file mode 100644
index 0000000000..35f972ef9a
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "Blueping plugin for opie-security authentication. \
+This is a bluetooth-based authentication plugin (you need \
+to have another Bluetooth device around to use it)."
+RDEPENDS += "bluez-utils"
+APPNAME = "multiauthbluepingplugin"
+
+include opie-securityplugin.inc
+
+S = "${WORKDIR}/blueping"
+
+do_install() {
+ install -d ${D}${palmtopdir}/pics/security/
+ install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb
index 85127240ab..65de7b78ec 100644
--- a/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_1.2.1.bb
@@ -1,26 +1,5 @@
-DESCRIPTION = "Blueping plugin for opie-security authentication. \
-This is a bluetooth-based authentication plugin (you need \
-to have another Bluetooth device around to use it)."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthbluepingplugin.ts"
-RDEPENDS = "opie-security bluez-utils"
-
-APPNAME = "multiauthbluepingplugin"
-
+include opie-securityplugin-blueping.inc
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/blueping \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
-S = "${WORKDIR}/blueping"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth
-do_install() {
- install -d ${D}${palmtopdir}/pics/security/
- install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
index 45f5ecf221..52bcbe6d16 100644
--- a/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-blueping_cvs.bb
@@ -1,25 +1,7 @@
-DESCRIPTION = "Blueping plugin for opie-security authentication. \
-This is a bluetooth-based authentication plugin (you need \
-to have another Bluetooth device around to use it)."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthbluepingplugin.ts"
-RDEPENDS = "opie-security bluez-utils"
+include opie-securityplugin-blueping.inc
+
PV = "${OPIE_CVS_PV}"
-APPNAME = "multiauthbluepingplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/blueping \
${HANDHELDS_CVS};module=opie/pics "
-S = "${WORKDIR}/blueping"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth
-do_install() {
- install -d ${D}${palmtopdir}/pics/security/
- install -m 0644 ${WORKDIR}/pics/security/bluepingplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy.inc b/packages/opie-securityplugins/opie-securityplugin-dummy.inc
new file mode 100644
index 0000000000..bb0a9b962b
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "Dummy plugin for opie-security authentication. \
+This is a very simple authentication plugin (you just have \
+to press a button basically), for demonstration purpose."
+APPNAME = "multiauthdummyplugin"
+
+include opie-securityplugin.inc
+
+S = "${WORKDIR}/dummy"
+
+do_install() {
+ install -d ${D}${palmtopdir}/pics/security
+ install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb
index 825c14ea53..4a5bc3c2e0 100644
--- a/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy_1.2.1.bb
@@ -1,26 +1,5 @@
-DESCRIPTION = "Dummy plugin for opie-security authentication. \
-This is a very simple authentication plugin (you just have \
-to press a button basically), for demonstration purpose."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthdummyplugin.ts"
-RDEPENDS = "opie-security"
-
-APPNAME = "multiauthdummyplugin"
-
+include opie-securityplugin-dummy.inc
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/dummy \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
-S = "${WORKDIR}/dummy"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png
-do_install() {
- install -d ${D}${palmtopdir}/pics/security
- install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
index 5aad60f8a6..b0d1e8d49e 100644
--- a/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-dummy_cvs.bb
@@ -1,25 +1,7 @@
-DESCRIPTION = "Dummy plugin for opie-security authentication. \
-This is a very simple authentication plugin (you just have \
-to press a button basically), for demonstration purpose."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthdummyplugin.ts"
-RDEPENDS = "opie-security"
+include opie-securityplugin-dummy.inc
+
PV = "${OPIE_CVS_PV}"
-APPNAME = "multiauthdummyplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/dummy \
${HANDHELDS_CVS};module=opie/pics "
-S = "${WORKDIR}/dummy"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png
-do_install() {
- install -d ${D}${palmtopdir}/pics/security
- install -m 0644 ${WORKDIR}/pics/security/dummyplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice.inc b/packages/opie-securityplugins/opie-securityplugin-notice.inc
new file mode 100644
index 0000000000..09a4025760
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-notice.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "Notice plugin for opie-security authentication. \
+It allows you to display, for example, a notice from your legal departement."
+APPNAME = "multiauthnoticeplugin"
+
+include opie-securityplugin.inc
+
+S = "${WORKDIR}/notice"
+
+do_install() {
+ install -d ${D}${palmtopdir}/pics/security/
+ install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb
index b1f11bcf6a..08bd1b13c0 100644
--- a/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_1.2.1.bb
@@ -1,25 +1,5 @@
-DESCRIPTION = "Notice plugin for opie-security authentication. \
-It allows you to display, for example, a notice from your legal departement."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthnoticeplugin.ts"
-RDEPENDS = "opie-security"
-
-APPNAME = "multiauthnoticeplugin"
-
+include opie-securityplugin-notice.inc
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/notice \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
-S = "${WORKDIR}/notice"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png
-do_install() {
- install -d ${D}${palmtopdir}/pics/security/
- install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
index 1f1ec113be..5223edbaf8 100644
--- a/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-notice_cvs.bb
@@ -1,24 +1,7 @@
-DESCRIPTION = "Notice plugin for opie-security authentication. \
-It allows you to display, for example, a notice from your legal departement."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthnoticeplugin.ts"
-RDEPENDS = "opie-security"
+include opie-securityplugin-notice.inc
+
PV = "${OPIE_CVS_PV}"
-APPNAME = "multiauthnoticeplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/notice \
${HANDHELDS_CVS};module=opie/pics "
-S = "${WORKDIR}/notice"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png
-do_install() {
- install -d ${D}${palmtopdir}/pics/security/
- install -m 0644 ${WORKDIR}/pics/security/noticeplugin*.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin.inc b/packages/opie-securityplugins/opie-securityplugin-pin.inc
new file mode 100644
index 0000000000..6286d8abcf
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin-pin.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "PIN plugin for opie-security authentication. \
+It implements the same kind of widgets as opie-security package, \
+but this implementation can be used along with other authentication \
+methods in the Opie Multi-Authentication Framework."
+APPNAME = "multiauthpinplugin"
+
+include opie-securityplugin.inc
+
+S = "${WORKDIR}/pin"
+
+do_install() {
+ install -d ${D}${palmtopdir}/pics/security/
+ install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/
+}
+
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb
index 5a2d03f6d5..c5ccde6b5c 100644
--- a/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-pin_1.2.1.bb
@@ -1,27 +1,5 @@
-DESCRIPTION = "PIN plugin for opie-security authentication. \
-It implements the same kind of widgets as opie-security package, \
-but this implementation can be used along with other authentication \
-methods in the Opie Multi-Authentication Framework."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthpinplugin.ts"
-RDEPENDS = "opie-security"
-
-APPNAME = "multiauthpinplugin"
-
+include opie-securityplugin-pin.inc
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/securityplugins/pin \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
-
-S = "${WORKDIR}/pin"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png
-do_install() {
- install -d ${D}${palmtopdir}/pics/security/
- install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/
-}
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
diff --git a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
index 792fc706c0..bf2a607650 100644
--- a/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
+++ b/packages/opie-securityplugins/opie-securityplugin-pin_cvs.bb
@@ -1,26 +1,7 @@
-DESCRIPTION = "PIN plugin for opie-security authentication. \
-It implements the same kind of widgets as opie-security package, \
-but this implementation can be used along with other authentication \
-methods in the Opie Multi-Authentication Framework."
-SECTION = "opie/security"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-I18N_FILES = "libmultiauthpinplugin.ts"
-RDEPENDS = "opie-security"
+include opie-securityplugin-pin.inc
+
PV = "${OPIE_CVS_PV}"
-APPNAME = "multiauthpinplugin"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/securityplugins/pin \
${HANDHELDS_CVS};module=opie/pics "
-S = "${WORKDIR}/pin"
-
-inherit opie
-
-# FILES plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png
-do_install() {
- install -d ${D}${palmtopdir}/pics/security/
- install -m 0644 ${WORKDIR}/pics/security/pinplugin.png ${D}${palmtopdir}/pics/security/
-}
-
diff --git a/packages/opie-securityplugins/opie-securityplugin.inc b/packages/opie-securityplugins/opie-securityplugin.inc
new file mode 100644
index 0000000000..855a610f6d
--- /dev/null
+++ b/packages/opie-securityplugins/opie-securityplugin.inc
@@ -0,0 +1,8 @@
+SECTION = "opie/security"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+RDEPENDS = "opie-security"
+I18N_FILES = "lib${APPNAME}.ts"
+
+inherit opie
diff --git a/packages/opie-securityplugins/opie-securityplugins.inc b/packages/opie-securityplugins/opie-securityplugins.inc
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/opie-securityplugins/opie-securityplugins.inc
+++ /dev/null
diff --git a/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb b/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb
deleted file mode 100644
index c541bc78ed..0000000000
--- a/packages/opie-securityplugins/opie-securityplugins_1.2.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include ${PN}.inc
-
-
-
diff --git a/packages/opie-securityplugins/opie-securityplugins_cvs.bb b/packages/opie-securityplugins/opie-securityplugins_cvs.bb
deleted file mode 100644
index b844298382..0000000000
--- a/packages/opie-securityplugins/opie-securityplugins_cvs.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-include ${PN}.inc
-
-# Remove the dash below when 1.2.1 changes in PV
-PV = "1.2.1+cvs-${SRCDATE}" \ No newline at end of file