Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into home.hrw.one.pl:/home/hrw/zaurus/oe/packages

2004/11/20 20:55:12+01:00 hrw.one.pl!hrw
added license

2004/11/20 20:54:41+01:00 hrw.one.pl!hrw
fix ipsec module loading in collie kernel

BKrev: 419fa131Vo1a26ii6fm8bko4OAeonA

diff --git a/gpe-aerial/gpe-aerial_0.2.11.oe b/gpe-aerial/gpe-aerial_0.2.11.oe
index e69de29..ea25c10 100644 (file)
--- a/gpe-aerial/gpe-aerial_0.2.11.oe
+++ b/gpe-aerial/gpe-aerial_0.2.11.oe
@@ -0,0 +1,10 @@
+inherit gpe pkgconfig
+
+DESCRIPTION = "GPE wireless LAN communication applet"
+DEPENDS = "gtk+ libgpewidget"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.gz \
+          file://fix_makefile.patch;patch=1"

diff --git a/gpe-announce/gpe-announce_0.10.oe b/gpe-announce/gpe-announce_0.10.oe
index 6cbc51c..8d05d42 100644 (file)
--- a/gpe-announce/gpe-announce_0.10.oe
+++ b/gpe-announce/gpe-announce_0.10.oe
@@ -1,4 +1,5 @@
 SECTION = "gpe"
+LICENSE = "GPL"
 inherit gpe
 
 DEPENDS = "libsoundgen libschedule gtk+ libgpewidget"

diff --git a/gpe-bootsplash/gpe-bootsplash_1.13.oe b/gpe-bootsplash/gpe-bootsplash_1.13.oe
index 7d2ca24..69004f6 100644 (file)
--- a/gpe-bootsplash/gpe-bootsplash_1.13.oe
+++ b/gpe-bootsplash/gpe-bootsplash_1.13.oe
@@ -4,6 +4,7 @@ DEPENDS = "gtk+ librsvg"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
+LICENSE = "GPL"
 PR = "r2"
 
 SRC_URI += "file://splash-p.svg file://splash-l.svg"

diff --git a/gpe-calculator/gpe-calculator_0.2.oe b/gpe-calculator/gpe-calculator_0.2.oe
index e69de29..4e113dd 100644 (file)
--- a/gpe-calculator/gpe-calculator_0.2.oe
+++ b/gpe-calculator/gpe-calculator_0.2.oe
@@ -0,0 +1,10 @@
+inherit gpe pkgconfig
+
+DESCRIPTION = "A scientific calculator"
+DEPENDS = "gtk+ libgpewidget"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/${PN}-${PV}.tar.gz \
+          file://fix_makefile.patch;patch=1"

diff --git a/gpe-clock/gpe-clock_0.14.oe b/gpe-clock/gpe-clock_0.14.oe
index 666e6e8..ff3f088 100644 (file)
--- a/gpe-clock/gpe-clock_0.14.oe
+++ b/gpe-clock/gpe-clock_0.14.oe
@@ -6,6 +6,7 @@ RDEPENDS = "gpe-announce atd"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
+LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \

diff --git a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
index 3ff9d6d..531c738 100644 (file)
--- a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
+++ b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie
@@ -451,7 +451,7 @@ CONFIG_IPSEC_AUTH_HMAC_SHA1=y
 CONFIG_IPSEC_ESP=y
 CONFIG_IPSEC_ENC_3DES=y
 # CONFIG_IPSEC_ENC_AES is not set
-# CONFIG_IPSEC_ALG is not set
+CONFIG_IPSEC_ALG=y
 CONFIG_IPSEC_IPCOMP=y
 CONFIG_IPSEC_DEBUG=y
 

diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
index ecd4628..695ae81 100644 (file)
--- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -5,7 +5,7 @@ KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
 SHARPV = "20030509"
-PR = "r11"
+PR = "r12"
 DESCRIPTION = "Linux kernel for OpenZaurus StrongArm processor based devices."
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"