summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/foonas.conf2
-rw-r--r--packages/aircrack/aircrack-ng_0.7.bb5
-rw-r--r--packages/avahi/avahi.inc2
-rw-r--r--packages/exmap-console/.mtn2git_empty (renamed from packages/linux/linux-turbostation/2.6.20.1/.mtn2git_empty)0
-rw-r--r--packages/exmap-console/exmap-console.inc61
-rw-r--r--packages/exmap-console/exmap-console_0.4.bb2
-rw-r--r--packages/exmap-console/exmap-console_svn.bb10
-rw-r--r--packages/images/foonas-image.bb2
-rw-r--r--packages/linux/linux-turbostation/defconfig5
-rw-r--r--packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c14
-rw-r--r--packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig17
-rw-r--r--packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile12
-rw-r--r--packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c38
-rw-r--r--packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c13
-rw-r--r--packages/linux/linux-turbostation_2.6.20.2.bb (renamed from packages/linux/linux-turbostation_2.6.20.1.bb)6
-rw-r--r--packages/meta/foonas-packages.bb2
-rw-r--r--packages/procps/procps.inc14
-rw-r--r--packages/procps/procps_3.1.15.bb15
-rw-r--r--packages/procps/procps_3.2.1.bb16
-rw-r--r--packages/procps/procps_3.2.5.bb19
-rw-r--r--packages/procps/procps_3.2.7.bb19
-rw-r--r--packages/qpe-games/ziq_1.1ern.bb2
-rw-r--r--packages/rglueap/rglueap_0.1.bb8
-rw-r--r--packages/tasks/task-mokogateway.bb2
24 files changed, 141 insertions, 145 deletions
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 6d5385c338..6745d9d0ca 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -10,7 +10,7 @@ DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
DISTRO_TYPE = "alpha"
# These should be merged once the bogofeed change has been committed.
FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/packages"
-FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/{MACHINE}/cross/1.0-dev/kernel"
+FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/kernel"
#
# Naming schemes
diff --git a/packages/aircrack/aircrack-ng_0.7.bb b/packages/aircrack/aircrack-ng_0.7.bb
index 3093c39955..bf5bd27d9d 100644
--- a/packages/aircrack/aircrack-ng_0.7.bb
+++ b/packages/aircrack/aircrack-ng_0.7.bb
@@ -2,10 +2,7 @@ SECTION = "console/network"
DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
HOMEPAGE = "http://www.aircrack-ng.org/"
LICENSE = "GPLv2"
-MAINTAINER = "Zero_Chaos <sidhayn@gmail.com>"
-DEPENDS = ""
-RDEPENDS = ""
-PR="r2"
+PR = "r2"
SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz"
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index adb1356906..3a0b28cc53 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -5,7 +5,7 @@ SECTION = "network"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "expat libdaemon dbus"
+DEPENDS = "expat libdaemon dbus glib-2.0"
RRECOMMENDS = "libnss-mdns"
RRECOMMENDS_avahi-daemon = "libnss-mdns"
diff --git a/packages/linux/linux-turbostation/2.6.20.1/.mtn2git_empty b/packages/exmap-console/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-turbostation/2.6.20.1/.mtn2git_empty
+++ b/packages/exmap-console/.mtn2git_empty
diff --git a/packages/exmap-console/exmap-console.inc b/packages/exmap-console/exmap-console.inc
new file mode 100644
index 0000000000..4c107d5f07
--- /dev/null
+++ b/packages/exmap-console/exmap-console.inc
@@ -0,0 +1,61 @@
+DESCRIPTION = "Console based version of exmap, a memory usage analysis tool"
+HOMEPAGE = "http://projects.o-hand.com/exmap-console"
+SECTION = "devel"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+
+SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz"
+
+inherit module-base
+inherit autotools
+
+MYPV := "${PV}"
+
+PACKAGES += "exmap-server kernel-module-exmap"
+
+FILES_exmap-console = "${bindir}/exmap ${bindir}/exmapd"
+PACKAGE_ARCH_exmap-console = "${TARGET_ARCH}"
+RDEPENDS_exmap-console += "kernel-module-exmap"
+
+FILES_exmap-server = "${bindir}/exmapserver"
+PACKAGE_ARCH_exmap-server = "${TARGET_ARCH}"
+RDEPENDS_exmap-server += "kernel-module-exmap"
+
+FILES_kernel-module-exmap = "${base_libdir}"
+PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}"
+PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
+RDEPENDS_kernel-module-exmap += "kernel (${KERNEL_VERSION})"
+
+S = "${WORKDIR}/exmap-console-${PV}"
+
+export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}"
+
+do_compile() {
+ cd ${S}/src
+ make
+
+ cd ${S}/kernel
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \
+ KERNEL_SRC=${STAGING_KERNEL_DIR} \
+ KERNEL_VERSION=${KERNEL_VERSION} \
+ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+ ${MAKE_TARGETS}
+}
+
+do_install() {
+ oe_runmake 'DESTDIR=${D}' 'DEPMOD=/bin/true' install
+}
+
+pkg_postinst_append_kernel-module-exmap () {
+ if [ -n "$D" ]; then
+ exit 1
+ fi
+ depmod -a
+ update-modules || true
+}
+
+pkg_postrm_append_kernel-module-exmap () {
+ update-modules || true
+}
+
diff --git a/packages/exmap-console/exmap-console_0.4.bb b/packages/exmap-console/exmap-console_0.4.bb
new file mode 100644
index 0000000000..5d89f04937
--- /dev/null
+++ b/packages/exmap-console/exmap-console_0.4.bb
@@ -0,0 +1,2 @@
+require exmap-console.inc
+
diff --git a/packages/exmap-console/exmap-console_svn.bb b/packages/exmap-console/exmap-console_svn.bb
new file mode 100644
index 0000000000..9e6ca80dc0
--- /dev/null
+++ b/packages/exmap-console/exmap-console_svn.bb
@@ -0,0 +1,10 @@
+PR = "r10"
+PV = "0.4+svn${SRCDATE}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http"
+
+S = "${WORKDIR}/exmap-console"
+
+MYPV := "${PV}"
+PV_kernel-module-exmap = "${MYPV}-${KERNEL_VERSION}"
+
diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb
index f5a258b3d9..8d3541c114 100644
--- a/packages/images/foonas-image.bb
+++ b/packages/images/foonas-image.bb
@@ -75,7 +75,7 @@ turbostation_pack_image() {
PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz
HEX_MAX_KERN_SIZE=200000
DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc `
- HEX_MAX_ROOT_SIZE=C80000
+ HEX_MAX_ROOT_SIZE=D00000
DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc `
KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'`
if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then
diff --git a/packages/linux/linux-turbostation/defconfig b/packages/linux/linux-turbostation/defconfig
index 4930877637..094f6f3708 100644
--- a/packages/linux/linux-turbostation/defconfig
+++ b/packages/linux/linux-turbostation/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20.1
-# Thu Mar 8 19:11:26 2007
+# Linux kernel version: 2.6.20.2
+# Sun Mar 11 15:29:33 2007
#
CONFIG_MMU=y
CONFIG_GENERIC_HARDIRQS=y
@@ -958,7 +958,6 @@ CONFIG_I2C_MPC=y
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_M41T00 is not set
# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_S35390A is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
diff --git a/packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c b/packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c
deleted file mode 100644
index 05b2a41e7f..0000000000
--- a/packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: linux-2.6.20.1/arch/ppc/syslib/open_pic.c
-===================================================================
---- linux-2.6.20.1.orig/arch/ppc/syslib/open_pic.c 2007-02-20 07:34:32.000000000 +0100
-+++ linux-2.6.20.1/arch/ppc/syslib/open_pic.c 2007-02-26 02:26:56.000000000 +0100
-@@ -318,7 +318,8 @@
- #ifdef CONFIG_EPIC_SERIAL_MODE
- /* Have to start from ground zero.
- */
-- openpic_reset();
-+ // 2005.09.06, JohnsonCheng Fixed USB device Oops bug
-+ //openpic_reset();
- #endif
-
- if (ppc_md.progress) ppc_md.progress("openpic: enter", 0x122);
diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig b/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig
deleted file mode 100644
index 6cd91368f4..0000000000
--- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: linux-2.6.20.1/drivers/i2c/chips/Kconfig
-===================================================================
---- linux-2.6.20.1.orig/drivers/i2c/chips/Kconfig 2007-02-20 07:34:32.000000000 +0100
-+++ linux-2.6.20.1/drivers/i2c/chips/Kconfig 2007-02-26 02:27:27.000000000 +0100
-@@ -125,4 +125,12 @@
- This driver can also be built as a module. If so, the module
- will be called max6875.
-
-+config SENSORS_S35390A
-+ tristate "S-35390A RTC chip"
-+ depends on I2C && PPC32 && SANDPOINT
-+ help
-+ If you say yes here you get support for the S-35390A RTC chip/
-+
-+ This driver can also be built as a module. If so, the module
-+ will be called i2c-s3531a
- endmenu
diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile b/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile
deleted file mode 100644
index 3378609724..0000000000
--- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: linux-2.6.20.1/drivers/i2c/chips/Makefile
-===================================================================
---- linux-2.6.20.1.orig/drivers/i2c/chips/Makefile 2007-02-20 07:34:32.000000000 +0100
-+++ linux-2.6.20.1/drivers/i2c/chips/Makefile 2007-02-26 02:27:43.000000000 +0100
-@@ -12,6 +12,7 @@
- obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
- obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
- obj-$(CONFIG_TPS65010) += tps65010.o
-+obj-$(CONFIG_SENSORS_S35390A) += i2c-s3531a.o
-
- ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
- EXTRA_CFLAGS += -DDEBUG
diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c b/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c
index b73b227220..e1895af53a 100644
--- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c
+++ b/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c
@@ -1,8 +1,8 @@
-Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c
+Index: linux-2.6.20.2/drivers/mtd/maps/physmap.c
===================================================================
---- linux-2.6.21-rc2-git3.orig/drivers/mtd/maps/physmap.c 2007-03-06 01:06:56.000000000 +0100
-+++ linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c 2007-03-06 01:12:35.000000000 +0100
-@@ -134,13 +134,43 @@
+--- linux-2.6.20.2.orig/drivers/mtd/maps/physmap.c 2007-03-11 15:22:25.000000000 +0100
++++ linux-2.6.20.2/drivers/mtd/maps/physmap.c 2007-03-11 15:28:18.000000000 +0100
+@@ -134,13 +134,53 @@
}
info->mtd->owner = THIS_MODULE;
@@ -11,27 +11,37 @@ Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c
+ .name = "u-boot",
+ .offset = 0x00F00000,
+ .size = 0x00040000,
-+ .mask_flags = MTD_WRITEABLE, /* force read-only */
++ .mask_flags = MTD_WRITEABLE,
+ },
+ {
-+ .name = "kernel", /* default kernel image */
++ .name = "kernel",
+ .offset = 0x00000000,
-+ .size = 0x00280000,
++ .size = 0x00200000,
+ },
+ {
+ .name = "rootfs",
-+ .offset = 0x00280000,
-+ .size = 0x00C80000,
++ .offset = 0x00200000,
++ .size = 0x00D00000,
+ },
+ {
-+ .name = "empty",
++ .name = "u-boot env",
+ .offset = 0x00F40000,
-+ .size = 0x000A0000,
++ .size = 0x00020000,
+ },
+ {
-+ .name = "u-boot env",
-+ .offset = 0x00FE0000,
++ .name = "u-boot2",
++ .offset = 0x00F60000,
++ .size = 0x00040000,
++ },
++ {
++ .name = "u-boot2 env",
++ .offset = 0x00FA0000,
+ .size = 0x00020000,
++ },
++ {
++ .name = "sysconf",
++ .offset = 0x00FC0000,
++ .size = 0x00040000,
+ }
+};
+
@@ -43,7 +53,7 @@ Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c
return 0;
}
-
-+ physmap_set_partitions(TS101_partitions, 5);
++ physmap_set_partitions(TS101_partitions, 7);
if (physmap_data->nr_parts) {
printk(KERN_NOTICE "Using physmap partition information\n");
add_mtd_partitions(info->mtd, physmap_data->parts,
diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c b/packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c
deleted file mode 100644
index 8ba15e1a84..0000000000
--- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: linux-2.6.20.1/drivers/net/r8169.c
-===================================================================
---- linux-2.6.20.1.orig/drivers/net/r8169.c 2007-02-26 03:33:53.000000000 +0100
-+++ linux-2.6.20.1/drivers/net/r8169.c 2007-02-26 03:34:21.000000000 +0100
-@@ -1522,7 +1522,7 @@
- goto err_out_disable_2;
-
- /* save power state before pci_enable_device overwrites it */
-- pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
-+ pm_cap = 220; // pci_find_capability(pdev, PCI_CAP_ID_PM)
- if (pm_cap) {
- u16 pwr_command, acpi_idle_state;
-
diff --git a/packages/linux/linux-turbostation_2.6.20.1.bb b/packages/linux/linux-turbostation_2.6.20.2.bb
index a74bf1475a..84701e4a6a 100644
--- a/packages/linux/linux-turbostation_2.6.20.1.bb
+++ b/packages/linux/linux-turbostation_2.6.20.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
SECTION = "kernel"
LICENSE = "GPL"
DEPENDS = "uboot-utils"
-PR = "r6"
+PR = "r1"
COMPATIBLE_MACHINE = "turbostation"
@@ -11,17 +11,13 @@ RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://001_r1000.diff;patch=1 \
file://linux-2.6.16_arch_ppc_platforms_sandpoint.h;patch=1 \
- file://linux-2.6.16_drivers_i2c_chips_Makefile;patch=1 \
file://002_qnap-pic.diff;patch=1 \
file://linux-2.6.16_arch_ppc_syslib_Makefile;patch=1 \
file://linux-2.6.16_drivers_mtd_maps_physmap.c;patch=1 \
file://linux-2.6.16_arch_ppc_syslib_mpc10x_common.c;patch=1 \
- file://linux-2.6.16_drivers_net_r8169.c;patch=1 \
file://linux-2.6.16_arch_ppc_platforms_Makefile;patch=1 \
- file://linux-2.6.16_arch_ppc_syslib_open_pic.c;patch=1 \
file://linux-2.6.16_include_asm-ppc_mpc10x.h;patch=1 \
file://linux-2.6.16_arch_ppc_platforms_sandpoint.c;patch=1 \
- file://linux-2.6.16_drivers_i2c_chips_Kconfig;patch=1 \
file://defconfig"
S = "${WORKDIR}/linux-${PV}"
diff --git a/packages/meta/foonas-packages.bb b/packages/meta/foonas-packages.bb
index 822b7afb2d..da3cb40de7 100644
--- a/packages/meta/foonas-packages.bb
+++ b/packages/meta/foonas-packages.bb
@@ -45,6 +45,7 @@ FOONAS_PACKAGES = "\
flite \
gallery \
gawk \
+ gcc \
gdbm \
gnu-config \
grep \
@@ -119,6 +120,7 @@ FOONAS_PACKAGES = "\
syslog-ng \
tar \
thttpd \
+ tzdata \
tiff \
unzip \
usbutils \
diff --git a/packages/procps/procps.inc b/packages/procps/procps.inc
new file mode 100644
index 0000000000..ddc8030077
--- /dev/null
+++ b/packages/procps/procps.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "Procps is the package that has a bunch \
+of small useful utilities that give information \
+about processes using the /proc filesystem. The package \
+includes the programs ps, top, vmstat, w, kill, and skill."
+HOMEPAGE = "http://procps.sf.net"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
+
+SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
+ file://install.patch;patch=1"
+
+inherit autotools
diff --git a/packages/procps/procps_3.1.15.bb b/packages/procps/procps_3.1.15.bb
index 12d6a43fd2..01114e80dc 100644
--- a/packages/procps/procps_3.1.15.bb
+++ b/packages/procps/procps_3.1.15.bb
@@ -1,17 +1,6 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
+require procps.inc
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
- file://procps_${PV}-2.diff;patch=1 \
- file://install.patch;patch=1"
-
-inherit autotools
+SRC_URI += "file://procps_${PV}-2.diff;patch=1"
EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \
LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \
diff --git a/packages/procps/procps_3.2.1.bb b/packages/procps/procps_3.2.1.bb
index 3c0aaf547a..33df399c5f 100644
--- a/packages/procps/procps_3.2.1.bb
+++ b/packages/procps/procps_3.2.1.bb
@@ -1,18 +1,8 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
-PR = "r1"
+require procps.inc
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
- file://install.patch;patch=1 \
- file://pagesz-not-constant.patch;patch=1"
+PR = "r1"
-inherit autotools
+SRC_URI += "file://pagesz-not-constant.patch;patch=1"
EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \
LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \
diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb
index 5101874a5b..de7524b2cb 100644
--- a/packages/procps/procps_3.2.5.bb
+++ b/packages/procps/procps_3.2.5.bb
@@ -1,21 +1,10 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
-PR = "r5"
-
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
- file://install.patch;patch=1 \
- file://procmodule.patch;patch=1 \
- file://psmodule.patch;patch=1"
+require procps.inc
+PR = "r5"
+SRC_URI += "file://procmodule.patch;patch=1 \
+ file://psmodule.patch;patch=1"
-inherit autotools
FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
diff --git a/packages/procps/procps_3.2.7.bb b/packages/procps/procps_3.2.7.bb
index 5101874a5b..de7524b2cb 100644
--- a/packages/procps/procps_3.2.7.bb
+++ b/packages/procps/procps_3.2.7.bb
@@ -1,21 +1,10 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
-PR = "r5"
-
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
- file://install.patch;patch=1 \
- file://procmodule.patch;patch=1 \
- file://psmodule.patch;patch=1"
+require procps.inc
+PR = "r5"
+SRC_URI += "file://procmodule.patch;patch=1 \
+ file://psmodule.patch;patch=1"
-inherit autotools
FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
diff --git a/packages/qpe-games/ziq_1.1ern.bb b/packages/qpe-games/ziq_1.1ern.bb
index fe41a7489e..f51805f1d8 100644
--- a/packages/qpe-games/ziq_1.1ern.bb
+++ b/packages/qpe-games/ziq_1.1ern.bb
@@ -10,6 +10,7 @@ SRC_URI = "http://handhelds.org/~zecke/oe_packages/ziq_V1.1ern.tar.gz \
file://ziq.patch;patch=1"
PV = "1.1ern"
+PR = "r1"
S = "${WORKDIR}/ziq_V${PV}"
@@ -21,6 +22,7 @@ APPDESKTOP = "${S}"
do_install () {
install -d ${D}${palmtopdir}/apps/Games/
install -d ${D}${palmtopdir}/pics/${APPNAME}/
+ install -d ${D}${palmtopdir}/apps/Games
install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
}
diff --git a/packages/rglueap/rglueap_0.1.bb b/packages/rglueap/rglueap_0.1.bb
index 2d6cd2c41b..c26bf31eaa 100644
--- a/packages/rglueap/rglueap_0.1.bb
+++ b/packages/rglueap/rglueap_0.1.bb
@@ -1,10 +1,12 @@
-DESCRIPTION = "Raw Glue AP"
-SECTION = "console/network"
+DESCRIPTION = "Raw Glue AP, wireless intrusion detection"
+AUTHOR = "Laurent Butti"
HOMEPAGE = "http://rfakeap.tuxfamily.org/#Raw_Glue_AP"
+SECTION = "console/network"
+PRIORITY = "optional"
LICENSE = "GPLv2"
DEPENDS = "libpcap"
-SRC_URI = "http://rfakeap.tuxfamily.org/rglueap-${PV}.tar.gz"
+SRC_URI = "http://rfakeap.tuxfamily.org/${P}.tar.gz"
LDFLAGS += "-lpcap"
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index 1d05af8c4f..a17d9c668c 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -3,7 +3,7 @@ ALLOW_EMPTY = "1"
PACKAGE_ARCH = "all"
LICENSE = "MIT"
PROVIDES = "task-mokogateway-everything"
-PR = "2"
+PR = "r2"
PACKAGES = "\
task-mokogateway-everything \