Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/31 10:27:11-08:00 (none)!ggilbert
These fonts appear to be derived from the MS Core fonts which do not
allow modification or distribution outside of the exe's MS released
.del-qpf-verdana_1.0.bb~625cb40657a05a6f:
  Delete: packages/qpf-fonts/qpf-verdana_1.0.bb
.del-qpf-georgia_1.0.bb~ef9e3d0fabb2ec85:
  Delete: packages/qpf-fonts/qpf-georgia_1.0.bb

2004/12/31 12:27:22-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2004/12/31 12:27:07-05:00 handhelds.org!kergoth
Add unionfs 1.0.4.

2004/12/31 17:09:41+00:00 nexus.co.uk!pb
change $HOME for root to /home/root in passwd.master


2004/12/31 16:56:52+00:00 nexus.co.uk!pb
blow away some outdated handhelds-pxa kernels


2004/12/31 16:55:28+00:00 nexus.co.uk!pb
remove spurious PACKAGE_ARCH

2004/12/31 16:48:07+00:00 nexus.co.uk!pb
curtail stack smashing when receiving a dbus error


2004/12/31 16:44:26+00:00 nexus.co.uk!pb
add copyright header to update-rc.d script


BKrev: 41d59a00a2p6CzivhRXSNm80dLBliA

9 files changed, 0 insertions, 180 deletions

diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.12/defconfig-ipaqpxa b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.12/defconfig-ipaqpxa
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.12/defconfig-ipaqpxa
+++ /dev/null
diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.12/ipsec.patch b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.12/ipsec.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.12/ipsec.patch
+++ /dev/null
diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.13/defconfig-ipaqpxa b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.13/defconfig-ipaqpxa
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.13/defconfig-ipaqpxa
+++ /dev/null
diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.14/defconfig-ipaqpxa b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.14/defconfig-ipaqpxa
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.14/defconfig-ipaqpxa
+++ /dev/null
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.bb
deleted file mode 100644
index b3dcf57ba8..0000000000
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "GPL"
-PR = "r4"
-
-KERNEL_CCSUFFIX = "-3.3.3"
-COMPATIBLE_HOST = "arm.*-linux"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-	   file://defconfig-ipaqpxa \
-	   file://ipaq-hal.init \
-	   file://linux-2.4-no-short-loads.patch;patch=1 \
-	   file://linux-2.4-cpufreq.patch;patch=1 \
-	   file://ipsec.patch;patch=1"
-
-S = "${WORKDIR}/kernel"
-
-inherit kernel update-rc.d
-
-PACKAGE_ARCH = "ipaqpxa"
-
-K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
-K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
-K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
-RMKV    = "${@bb.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}"
-PXAV    = "${@bb.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}"
-HHV     = "${@bb.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
-
-KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + int(bb.data.getVar('RMKV',d,1)) * 1000 + int(bb.data.getVar('PXAV',d,1)) * 100 + float(bb.data.getVar('HHV',d,1)))}"
-
-module_conf_h3900_asic = "alias ipaq_hal_3900 h3900_asic"
-module_conf_h5400_asic = "alias ipaq_hal_5400 h5400_asic"
-module_conf_pxa_ir = "alias irda0 pxa_ir"
-module_conf_i2c_algo_pxa = "options i2c-algo-pxa pxa_scan=0"
-module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1"
-module_conf_ppp_async = "alias ppp0 ppp_async"
-module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
-module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
-
-module_autoload_h3600_generic_sleeve = "h3600_generic_sleeve"
-module_autoload_ds = "ds"
-module_autoload_pxa_cs = "pxa_cs"
-module_autoload_h3600_ts = "h3600_ts"
-module_autoload_apm = "apm"
-
-FILES_kernel += "/etc/init.d/ipaq-hal"
-INITSCRIPT_NAME = "ipaq-hal"
-INITSCRIPT_PARAMS = "start 21 S ."
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config
-}
-
-do_install_append() {
-	install -d ${D}/etc/init.d
-	install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
-}
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.bb
deleted file mode 100644
index c54d47d095..0000000000
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "GPL"
-PR = "r0"
-
-KERNEL_CCSUFFIX = "-3.3.3"
-COMPATIBLE_HOST = "arm.*-linux"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-	   file://defconfig-ipaqpxa \
-	   file://ipaq-hal.init \
-	   file://linux-2.4-no-short-loads.patch;patch=1 \
-	   file://linux-2.4-cpufreq.patch;patch=1 \
-	   file://ipsec.patch;patch=1"
-
-S = "${WORKDIR}/kernel"
-
-inherit kernel update-rc.d
-
-PACKAGE_ARCH = "ipaqpxa"
-
-K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
-K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
-K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
-RMKV    = "${@bb.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}"
-PXAV    = "${@bb.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}"
-HHV     = "${@bb.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
-
-KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + int(bb.data.getVar('RMKV',d,1)) * 1000 + int(bb.data.getVar('PXAV',d,1)) * 100 + float(bb.data.getVar('HHV',d,1)))}"
-
-module_conf_h3900_asic = "alias ipaq_hal_3900 h3900_asic"
-module_conf_h5400_asic = "alias ipaq_hal_5400 h5400_asic"
-module_conf_pxa_ir = "alias irda0 pxa_ir"
-module_conf_i2c_algo_pxa = "options i2c-algo-pxa pxa_scan=0"
-module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1"
-module_conf_ppp_async = "alias ppp0 ppp_async"
-module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
-module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
-
-module_autoload_h3600_generic_sleeve = "h3600_generic_sleeve"
-module_autoload_ds = "ds"
-module_autoload_pxa_cs = "pxa_cs"
-module_autoload_h3600_ts = "h3600_ts"
-module_autoload_apm = "apm"
-
-FILES_kernel += "/etc/init.d/ipaq-hal"
-INITSCRIPT_NAME = "ipaq-hal"
-INITSCRIPT_PARAMS = "start 21 S ."
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config
-}
-
-do_install_append() {
-	install -d ${D}/etc/init.d
-	install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
-}
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.bb
deleted file mode 100644
index 718a188297..0000000000
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "GPL"
-PR = "r3"
-
-KERNEL_CCSUFFIX = "-3.3.3"
-COMPATIBLE_HOST = "arm.*-linux"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-	   file://defconfig-ipaqpxa \
-	   file://ipaq-hal.init \
-	   file://linux-2.4-no-short-loads.patch;patch=1 \
-	   file://linux-2.4-cpufreq.patch;patch=1"
-
-S = "${WORKDIR}/kernel"
-
-inherit kernel update-rc.d
-
-PACKAGE_ARCH = "ipaqpxa"
-
-K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
-K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
-K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
-RMKV    = "${@bb.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}"
-PXAV    = "${@bb.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}"
-HHV     = "${@bb.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
-
-KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + int(bb.data.getVar('RMKV',d,1)) * 1000 + int(bb.data.getVar('PXAV',d,1)) * 100 + float(bb.data.getVar('HHV',d,1)))}"
-
-module_conf_h3900_asic = "alias ipaq_hal_3900 h3900_asic"
-module_conf_h5400_asic = "alias ipaq_hal_5400 h5400_asic"
-module_conf_pxa_ir = "alias irda0 pxa_ir"
-module_conf_i2c_algo_pxa = "options i2c-algo-pxa pxa_scan=0"
-module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1"
-module_conf_ppp_async = "alias ppp0 ppp_async"
-module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
-module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
-
-module_autoload_h3600_generic_sleeve = "h3600_generic_sleeve"
-module_autoload_h3600_ts = "h3600_ts"
-module_autoload_apm = "apm"
-module_autoload_af_packet = "af_packet"
-module_autoload_usb-ohci-h5400 = "usb-ohci-h5400"
-module_autoload_ppp_async = "ppp_async"
-module_autoload_usb_eth = "usb-eth"
-
-FILES_kernel += "/etc/init.d/ipaq-hal"
-INITSCRIPT_NAME = "ipaq-hal"
-INITSCRIPT_PARAMS = "start 21 S ."
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config
-}
-
-do_install_append() {
-	install -d ${D}/etc/init.d
-	install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
-}
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
index 4ee65528df..e824e73219 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -18,9 +18,6 @@ S = "${WORKDIR}/kernel"
 
 inherit kernel update-rc.d
 
-# kernel.oeclass stomps on this
-PACKAGE_ARCH = "ipaqpxa"
-
 K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
 K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
 K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
index 3984a65a9c..74e6e596c7 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -16,8 +16,6 @@ S = "${WORKDIR}/kernel"
 
 inherit kernel update-rc.d
 
-PACKAGE_ARCH = "ipaqsa"
-
 K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
 K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
 K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"