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

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

2005/01/22 01:20:34+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/01/22 01:17:38+00:00 nexus.co.uk!pb
fix typo in modconf for i2c-algo-pxa

2005/01/21 19:49:07-05:00 handhelds.org!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into handhelds.org:/home/kergoth/code/openembedded

2005/01/21 19:48:44-05:00 handhelds.org!kergoth
Add samba 3.0.10, and consolidate the common samba metadata into a .inc.

BKrev: 41f1aefbBtClGMOpAjU1Aem9kajGjQ

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 e95f809..5e4da53 100644 (file)
--- 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
@@ -2,7 +2,7 @@ SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
@@ -30,7 +30,7 @@ KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + i
 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_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"

diff --git a/packages/samba/samba-3.0.5/cifs.patch b/packages/samba/files/cifs.patch
similarity index 100%
rename from packages/samba/samba-3.0.5/cifs.patch
rename to packages/samba/files/cifs.patch

diff --git a/packages/samba/samba-3.0.5/configure.patch b/packages/samba/files/configure.patch
similarity index 100%
rename from packages/samba/samba-3.0.5/configure.patch
rename to packages/samba/files/configure.patch

diff --git a/packages/samba/samba-3.0.9/cifs.patch b/packages/samba/samba.inc
similarity index 100%
rename from packages/samba/samba-3.0.9/cifs.patch
rename to packages/samba/samba.inc

diff --git a/packages/samba/samba-3.0.9/configure.patch b/packages/samba/samba_3.0.10.bb
similarity index 100%
rename from packages/samba/samba-3.0.9/configure.patch
rename to packages/samba/samba_3.0.10.bb

diff --git a/packages/samba/samba_3.0.5.bb b/packages/samba/samba_3.0.5.bb
index 040b5a7..be6a9ca 100644 (file)
--- a/packages/samba/samba_3.0.5.bb
+++ b/packages/samba/samba_3.0.5.bb
@@ -1,42 +1,6 @@
-SECTION = "console/network"
-DEPENDS = readline
-LICENSE = "GPL"
 SRC_URI := "http://us2.samba.org/samba/ftp/old-versions/samba-${PV}.tar.gz \
           file://${FILESDIR}/configure.patch;patch=1 \
           file://${FILESDIR}/cifs.patch;patch=1"
 S := ${WORKDIR}/${P}/source
 
-PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc"
-FILES_cifs = "${bindir}/mount.cifs"
-FILES_cifs-doc = "${docdir}/mount.cifs.8"
-FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
-FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
-
-inherit autotools
-
-EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
-             --without-ads --without-automount --with-smbmount'
-do_configure_prepend () {
-       ./script/mkversion.sh
-       if [ ! -e acinclude.m4 ]; then
-               cat aclocal.m4 > acinclude.m4
-       fi
-}
-
-do_compile_append () {
-       ${CC} client/mount.cifs.c -o mount.cifs
-
-}
-
-do_install_append() {
-       mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0
-       ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so
-       rm -f ${D}${bindir}/*.old
-       rm -f ${D}${sbindir}/*.old
-       mv mount.cifs  ${D}${bindir}/mount.cifs
-}
-
-do_stage() {
-       install -m 0644 include/libsmbclient.h ${STAGING_INCDIR}
-       oe_libinstall -C bin -a -so libsmbclient ${STAGING_LIBDIR}
-}
+include samba.inc

diff --git a/packages/samba/samba_3.0.9.bb b/packages/samba/samba_3.0.9.bb
index 4c883f3..be6a9ca 100644 (file)
--- a/packages/samba/samba_3.0.9.bb
+++ b/packages/samba/samba_3.0.9.bb
@@ -1,42 +1,6 @@
-SECTION = "console/network"
-DEPENDS = readline
-LICENSE = "GPL"
-SRC_URI := "http://us2.samba.org/samba/ftp/samba-${PV}.tar.gz \
+SRC_URI := "http://us2.samba.org/samba/ftp/old-versions/samba-${PV}.tar.gz \
           file://${FILESDIR}/configure.patch;patch=1 \
           file://${FILESDIR}/cifs.patch;patch=1"
 S := ${WORKDIR}/${P}/source
 
-PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc"
-FILES_cifs = "${bindir}/mount.cifs"
-FILES_cifs-doc = "${docdir}/mount.cifs.8"
-FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
-FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
-
-inherit autotools
-
-EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
-             --without-ads --without-automount --with-smbmount'
-do_configure_prepend () {
-       ./script/mkversion.sh
-       if [ ! -e acinclude.m4 ]; then
-               cat aclocal.m4 > acinclude.m4
-       fi
-}
-
-do_compile_append () {
-       ${CC} client/mount.cifs.c -o mount.cifs
-
-}
-
-do_install_append() {
-       mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0
-       ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so
-       rm -f ${D}${bindir}/*.old
-       rm -f ${D}${sbindir}/*.old
-       mv mount.cifs  ${D}${bindir}/mount.cifs
-}
-
-do_stage() {
-       install -m 0644 include/libsmbclient.h ${STAGING_INCDIR}
-       oe_libinstall -C bin -a -so libsmbclient ${STAGING_LIBDIR}
-}
+include samba.inc