summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/machine/include/collie-2.4.conf3
-rw-r--r--packages/grub/grub_0.93.bb7
-rw-r--r--packages/grub/grub_0.97.bb10
-rw-r--r--packages/samba/samba-essential.inc9
-rw-r--r--packages/samba/samba-essential_3.0.20.bb13
-rw-r--r--packages/samba/samba.inc16
-rw-r--r--packages/samba/samba_3.0.10.bb5
-rw-r--r--packages/samba/samba_3.0.14a.bb12
-rw-r--r--packages/samba/samba_3.0.20.bb12
-rw-r--r--packages/samba/samba_3.0.23c.bb12
-rw-r--r--packages/samba/samba_3.0.5.bb5
-rw-r--r--packages/samba/samba_3.0.9.bb5
-rw-r--r--removal.txt5
13 files changed, 50 insertions, 64 deletions
diff --git a/conf/machine/include/collie-2.4.conf b/conf/machine/include/collie-2.4.conf
index a77d12a53f..5b99c7485d 100644
--- a/conf/machine/include/collie-2.4.conf
+++ b/conf/machine/include/collie-2.4.conf
@@ -1,4 +1,5 @@
-PREFERRED_PROVIDER_virtual/kernel = "collie-kernels-2.4-embedix"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
+COLLIE_MEMORY_SIZE =? "64"
# workaround for bug 1877
PREFERRED_PROVIDER_hostap-modules = "hostap-modules"
diff --git a/packages/grub/grub_0.93.bb b/packages/grub/grub_0.93.bb
index 8341184476..9fc008412d 100644
--- a/packages/grub/grub_0.93.bb
+++ b/packages/grub/grub_0.93.bb
@@ -1,14 +1,15 @@
DESCRIPTION = "GRUB is the GRand Unified Bootloader"
-SECTION = "base"
HOMEPAGE = "http://www.gnu.org/software/grub"
+SECTION = "bootloaders"
+PRIORITY = "optional"
SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \
file://autohell.patch;patch=1 \
file://memcpy.patch;patch=1 \
file://reiserfs.patch;patch=1"
-S = "${WORKDIR}/grub-${PV}"
-
inherit autotools
COMPATIBLE_HOST = 'i.86.*-linux'
+
+FILES_${PN}-doc = "${datadir}"
diff --git a/packages/grub/grub_0.97.bb b/packages/grub/grub_0.97.bb
index 051296a31a..044ecba577 100644
--- a/packages/grub/grub_0.97.bb
+++ b/packages/grub/grub_0.97.bb
@@ -1,10 +1,11 @@
-SECTION = "base"
-DESCRIPTION = "grand unified bootloader"
+DESCRIPTION = "GRUB is the GRand Unified Bootloader"
+HOMEPAGE = "http://www.gnu.org/software/grub"
+SECTION = "bootloaders"
+PRIORITY = "optional"
+PR = "r1"
SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz"
-S = "${WORKDIR}/grub-${PV}"
-
inherit autotools
python __anonymous () {
@@ -19,4 +20,5 @@ do_install_append_vmware() {
ln -sf ../usr/lib/grub/{$TARGET_ARCH}{$TARGET_VENDOR}/ ${D}/boot/grub
}
+FILES_${PN}-doc = "${datadir}"
FILES_${PN} = "/boot /usr"
diff --git a/packages/samba/samba-essential.inc b/packages/samba/samba-essential.inc
index fca08d1735..d718fc8a96 100644
--- a/packages/samba/samba-essential.inc
+++ b/packages/samba/samba-essential.inc
@@ -1,10 +1,15 @@
SECTION = "console/network"
-DEPENDS = "readline"
LICENSE = "GPL"
+DEPENDS = "readline"
+SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
+ file://configure.patch;patch=1 \
+ file://cifs.patch;patch=1"
+S = "${WORKDIR}/samba-${PV}/source"
+
inherit autotools
-EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
+EXTRA_OECONF = '--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
--without-ads --without-automount --without-smbmount --without-syslog \
--without-ldapsam --without-quotas --without-nisplus-home \
--without-sys-quotas --without-libsmbclient --without-winbind \
diff --git a/packages/samba/samba-essential_3.0.20.bb b/packages/samba/samba-essential_3.0.20.bb
index 365d208028..75febf4ab1 100644
--- a/packages/samba/samba-essential_3.0.20.bb
+++ b/packages/samba/samba-essential_3.0.20.bb
@@ -1,22 +1,17 @@
+require samba-essential.inc
+inherit update-rc.d
+
PR = "r5"
-SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://cifs.patch;patch=1 \
- file://config-lfs.patch;patch=1 \
+SRC_URI = "file://config-lfs.patch;patch=1 \
file://init-essential \
file://quota.patch;patch=1;pnum=0 \
file://smb-essential.conf \
file://smb-essential-inactive.conf \
file://Managing-Samba.txt"
-S := "${WORKDIR}/samba-${PV}/source"
-
RCONFLICTS = "samba"
-require samba-essential.inc
-inherit update-rc.d
-
INITSCRIPT_NAME = "samba"
# No dependencies, goes in at level 20 (NOTE: take care with the
# level, later levels put the shutdown later too - see the links
diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index f9dce44072..aa3083d1f6 100644
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -1,6 +1,16 @@
SECTION = "console/network"
-DEPENDS = "readline"
LICENSE = "GPL"
+DEPENDS = "readline"
+
+SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
+ file://configure.patch;patch=1 \
+ file://cifs.patch;patch=1"
+S = "${WORKDIR}/samba-${PV}/source"
+
+inherit autotools
+
+EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
+ --without-ads --without-automount --with-smbmount'
PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc"
FILES_cifs = "${bindir}/mount.cifs"
@@ -8,10 +18,6 @@ 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
diff --git a/packages/samba/samba_3.0.10.bb b/packages/samba/samba_3.0.10.bb
index 4aa262920c..895ce6b337 100644
--- a/packages/samba/samba_3.0.10.bb
+++ b/packages/samba/samba_3.0.10.bb
@@ -1,6 +1 @@
-SRC_URI := "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://${FILESDIR}/configure.patch;patch=1 \
- file://${FILESDIR}/cifs.patch;patch=1"
-S := "${WORKDIR}/${P}/source"
-
require samba.inc
diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb
index 08d3c390e7..d191363cd6 100644
--- a/packages/samba/samba_3.0.14a.bb
+++ b/packages/samba/samba_3.0.14a.bb
@@ -1,16 +1,12 @@
+require samba.inc
+inherit update-rc.d
+
PR = "r15"
-SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://cifs.patch;patch=1 \
- file://config-lfs.patch;patch=1 \
+SRC_URI += "file://config-lfs.patch;patch=1 \
file://init \
file://quota.patch;patch=1;pnum=0 \
"
-S = "${WORKDIR}/${P}/source"
-
-require samba.inc
-inherit update-rc.d
INITSCRIPT_NAME = "samba"
# No dependencies, goes in at level 20 (NOTE: take care with the
diff --git a/packages/samba/samba_3.0.20.bb b/packages/samba/samba_3.0.20.bb
index 7aa3d53626..fb2407c74f 100644
--- a/packages/samba/samba_3.0.20.bb
+++ b/packages/samba/samba_3.0.20.bb
@@ -1,16 +1,12 @@
+require samba.inc
+inherit update-rc.d
+
PR = "r5"
-SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://cifs.patch;patch=1 \
- file://config-lfs.patch;patch=1 \
+SRC_URI += "file://config-lfs.patch;patch=1 \
file://init \
file://quota.patch;patch=1;pnum=0 \
"
-S = "${WORKDIR}/${P}/source"
-
-require samba.inc
-inherit update-rc.d
INITSCRIPT_NAME = "samba"
# No dependencies, goes in at level 20 (NOTE: take care with the
diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb
index acec5afdd8..5317bcc62a 100644
--- a/packages/samba/samba_3.0.23c.bb
+++ b/packages/samba/samba_3.0.23c.bb
@@ -1,16 +1,10 @@
-PR = "r0"
+require samba.inc
+inherit update-rc.d
-SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://cifs.patch;patch=1 \
- file://config-lfs.patch;patch=1 \
+SRC_URI += "file://config-lfs.patch;patch=1 \
file://init \
file://quota.patch;patch=1;pnum=0 \
"
-S = "${WORKDIR}/${P}/source"
-
-include samba.inc
-inherit update-rc.d
INITSCRIPT_NAME = "samba"
# No dependencies, goes in at level 20 (NOTE: take care with the
diff --git a/packages/samba/samba_3.0.5.bb b/packages/samba/samba_3.0.5.bb
index 4aa262920c..895ce6b337 100644
--- a/packages/samba/samba_3.0.5.bb
+++ b/packages/samba/samba_3.0.5.bb
@@ -1,6 +1 @@
-SRC_URI := "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://${FILESDIR}/configure.patch;patch=1 \
- file://${FILESDIR}/cifs.patch;patch=1"
-S := "${WORKDIR}/${P}/source"
-
require samba.inc
diff --git a/packages/samba/samba_3.0.9.bb b/packages/samba/samba_3.0.9.bb
index 4aa262920c..895ce6b337 100644
--- a/packages/samba/samba_3.0.9.bb
+++ b/packages/samba/samba_3.0.9.bb
@@ -1,6 +1 @@
-SRC_URI := "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
- file://${FILESDIR}/configure.patch;patch=1 \
- file://${FILESDIR}/cifs.patch;patch=1"
-S := "${WORKDIR}/${P}/source"
-
require samba.inc
diff --git a/removal.txt b/removal.txt
index 17b7639586..fb5b8e4298 100644
--- a/removal.txt
+++ b/removal.txt
@@ -26,3 +26,8 @@ Reason: Obsoleted by task-base
Proposed by: Koen Kooi
Note: Moved to packages/obsolete/tasks on 2006-12-22
+Package Name: libmpeg2 (not mpeg2dec!)
+Removal Date: 2007-03-15
+Maintainer: unknown, checked in from BK repo, no updates after that
+Reason: mpeg2dec provides libmpeg2, see bug 375
+Proposed by: Laibsch
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 03:24:58 +0000