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

into sugarcube.dyndns.org:/home2/oe/oe/packages

2004/10/03 10:12:12+02:00 dyndns.org!reenoo
gpe-login: patch pre-session script to look for new style ramdisk location

2004/10/03 09:55:51+02:00 dyndns.org!reenoo
handhhelds-pxa, handhelds-sa: move corresponding filesdirs to reflect current PV; spotted by Paul Eggleton

BKrev: 415fb51eYODzn-j_ZZVl1-96DDzc4w

diff --git a/gpe-login/gpe-login-0.73/pre-session-ramdisk.patch b/gpe-login/gpe-login-0.73/pre-session-ramdisk.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gpe-login/gpe-login_0.73.oe b/gpe-login/gpe-login_0.73.oe
index 41e0a47..acb128f 100644 (file)
--- a/gpe-login/gpe-login_0.73.oe
+++ b/gpe-login/gpe-login_0.73.oe
@@ -7,7 +7,8 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd"
 RPROVIDES = "gpe-session-starter"
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://smaller-default-icon-size.patch;patch=1 \
-           file://user-own-collie-devs.patch;patch=1"
+           file://user-own-collie-devs.patch;patch=1 \
+           file://pre-session-ramdisk.patch;patch=1"

diff --git a/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.16/defconfig-ipaqpxa b/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.16/defconfig-ipaqpxa
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37/defconfig-ipaqpxa b/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37/defconfig-ipaqpxa
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.14/defconfig-ipaqsa b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.14/defconfig-ipaqsa
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37/defconfig-ipaqsa b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37/defconfig-ipaqsa
new file mode 100644 (file)
index 0000000..e69de29