summaryrefslogtreecommitdiff
path: root/openembedded
diff options
context:
space:
mode:
Diffstat (limited to 'openembedded')
-rw-r--r--openembedded/packages/avahi/avahi_0.5.2.bb2
-rw-r--r--openembedded/packages/avahi/avahi_0.6.bb51
-rw-r--r--openembedded/packages/base-files/base-files/borzoi/fstab37
-rw-r--r--openembedded/packages/base-files/base-files/spitz/fstab4
-rw-r--r--openembedded/packages/base-files/base-files_3.0.14.bb2
-rw-r--r--openembedded/packages/db/db3-native_3.2.9.bb2
-rw-r--r--openembedded/packages/db/db3_3.2.9.bb9
-rw-r--r--openembedded/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch82
-rw-r--r--openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb21
9 files changed, 176 insertions, 34 deletions
diff --git a/openembedded/packages/avahi/avahi_0.5.2.bb b/openembedded/packages/avahi/avahi_0.5.2.bb
index 6a1a393e1..e4291db2c 100644
--- a/openembedded/packages/avahi/avahi_0.5.2.bb
+++ b/openembedded/packages/avahi/avahi_0.5.2.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
HOMEPAGE = "http://www.freedesktop.org/Software/Avahi"
-LICENCE= "GPL"
+LICENSE= "GPL"
DEPENDS = "expat libdaemon dbus-0.50"
RRECOMMENDS = "libnss-mdns"
SECTION = "net"
diff --git a/openembedded/packages/avahi/avahi_0.6.bb b/openembedded/packages/avahi/avahi_0.6.bb
new file mode 100644
index 000000000..4ea3841f1
--- /dev/null
+++ b/openembedded/packages/avahi/avahi_0.6.bb
@@ -0,0 +1,51 @@
+DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
+HOMEPAGE = "http://www.freedesktop.org/Software/Avahi"
+LICENSE= "GPL"
+DEPENDS = "expat libdaemon dbus-0.50"
+RRECOMMENDS = "libnss-mdns"
+SECTION = "net"
+PRIORITY = "optional"
+PR = "r0"
+
+SRC_URI = "http://www.freedesktop.org/~lennart/avahi-${PV}.tar.gz"
+
+PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc"
+
+FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
+FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
+FILES_avahi-daemon = "${sbindir}/avahi-daemon \
+ ${sysconfdir}/avahi/avahi-daemon.conf \
+ ${sysconfdir}/avahi/services \
+ ${sysconfdir}/dbus-1 \
+ ${sysconfdir}/init.d/avahi-daemon \
+ ${datadir}/avahi/introspection/*.introspect \
+ ${datadir}/avahi/avahi-service.dtd \
+ ${datadir}/avahi/service-types"
+FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
+FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
+ ${sysconfdir}/avahi/avahi-dnsconfd.action \
+ ${sysconfdir}/init.d/avahi-dnsconfd"
+FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
+
+CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
+
+EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
+inherit autotools
+inherit update-rc.d
+
+INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
+INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
+INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
+INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
+INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
+
+pkg_postinst_avahi-daemon () {
+ grep avahi /etc/group || addgroup avahi
+ grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
+ /etc/init.d/dbus-1 force-reload
+}
+
+pkg_postrm_avahi-daemon () {
+ deluser avahi || true
+ delgroup avahi || true
+}
diff --git a/openembedded/packages/base-files/base-files/borzoi/fstab b/openembedded/packages/base-files/base-files/borzoi/fstab
index a44243923..21ef98e6e 100644
--- a/openembedded/packages/base-files/base-files/borzoi/fstab
+++ b/openembedded/packages/base-files/base-files/borzoi/fstab
@@ -1,19 +1,28 @@
-# Internal
-/dev/mtdblock2 / jffs2 rw,noatime 1 1
-/dev/mtdblock3 /home jffs2 defaults,noatime 1 2
-proc /proc proc defaults 0 0
-/dev/hda1 /media/hdd1 ext3 defaults,noatime,nodiratime 0 0
-
-tmpfs /var tmpfs defaults 0 0
-tmpfs /media/ram tmpfs defaults 0 0
+# don't mount /dev/mtdblock2 since Spitz uses pivot_root
+# or 2.6 directly boots from the hdd
+# /dev/mtdblock2 / jffs2 rw,noatime 1 1
+rootfs / auto defaults 1 1
+proc /proc proc defaults 0 0
+# we can use a normal var filesystem with a microdrive
+# tmpfs /var tmpfs defaults 0 0
+tmpfs /media/ram tmpfs defaults 0 0
+# Compact Flash memory cards
+/dev/hdc1 /media/cf auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.4
-/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
+/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0
# SD/MMC in kernel 2.6
-/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
+/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0
-# USB Storage
-/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
+#
+# USB
+#
+/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0
+devpts /dev/pts devpts mode=0620,gid=5 0 0
+usbdevfs /proc/bus/usb usbdevfs noauto 0 0
-# CF Storage
-/dev/hdb1 /media/cf ext3 defaults,sync,noauto 0 0
+#
+# Harddisk
+#
+/dev/hda2 /home ext3 noauto,defaults,noatime 0 0
+/dev/hda3 /media/hdd ext3 noauto,defaults,noatime 0 0
diff --git a/openembedded/packages/base-files/base-files/spitz/fstab b/openembedded/packages/base-files/base-files/spitz/fstab
index a418e3c6e..21ef98e6e 100644
--- a/openembedded/packages/base-files/base-files/spitz/fstab
+++ b/openembedded/packages/base-files/base-files/spitz/fstab
@@ -24,5 +24,5 @@ usbdevfs /proc/bus/usb usbdevfs noauto 0 0
#
# Harddisk
#
-/dev/hda2 /media/hdd ext3 noauto,defaults,noatime 0 0
-
+/dev/hda2 /home ext3 noauto,defaults,noatime 0 0
+/dev/hda3 /media/hdd ext3 noauto,defaults,noatime 0 0
diff --git a/openembedded/packages/base-files/base-files_3.0.14.bb b/openembedded/packages/base-files/base-files_3.0.14.bb
index 88b2735b5..7d53464a2 100644
--- a/openembedded/packages/base-files/base-files_3.0.14.bb
+++ b/openembedded/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Miscellaneous files for the base system."
SECTION = "base"
PRIORITY = "required"
-PR = "r43"
+PR = "r44"
LICENSE = "GPL"
SRC_URI = " \
diff --git a/openembedded/packages/db/db3-native_3.2.9.bb b/openembedded/packages/db/db3-native_3.2.9.bb
index 13c606366..44a8a5b60 100644
--- a/openembedded/packages/db/db3-native_3.2.9.bb
+++ b/openembedded/packages/db/db3-native_3.2.9.bb
@@ -1,4 +1,6 @@
SECTION = "libs"
+VIRTUAL_NAME = "virtual/db-native"
+CONFLICTS = "db-native"
inherit native
include db3_${PV}.bb
diff --git a/openembedded/packages/db/db3_3.2.9.bb b/openembedded/packages/db/db3_3.2.9.bb
index 4c7827974..335d83c17 100644
--- a/openembedded/packages/db/db3_3.2.9.bb
+++ b/openembedded/packages/db/db3_3.2.9.bb
@@ -2,7 +2,14 @@ SECTION = "libs"
DESCRIPTION = "Berkeley DB v3."
HOMEPAGE = "http://www.sleepycat.com"
LICENSE = "BSD Sleepycat"
-PR = "r1"
+PR = "r2"
+VIRTUAL_NAME ?= "virtual/db"
+CONFLICTS = "db"
+
+# it doesn't make any sense to have multiple relational
+# databases on an embedded machine, virtual/db allows
+# a build to select the desired one.
+PROVIDES += "${VIRTUAL_NAME}"
SRC_URI = "ftp://sleepycat1.inetu.net/releases/db-${PV}.tar.gz \
file://autofoo.patch;patch=1"
diff --git a/openembedded/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch b/openembedded/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch
new file mode 100644
index 000000000..979f0d1f0
--- /dev/null
+++ b/openembedded/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch
@@ -0,0 +1,82 @@
+--- e2fsprogs-1.38/misc/Makefile.in.orig 2005-11-08 23:56:06.000000000 +0100
++++ e2fsprogs-1.38/misc/Makefile.in 2005-11-08 23:59:15.000000000 +0100
+@@ -230,17 +230,13 @@
+ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
+ done
+ @echo " LINK $(root_sbindir)/mkfs.ext2"
+- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+- $(DESTDIR)$(root_sbindir)/mkfs.ext2
++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext2)
+ @echo " LINK $(root_sbindir)/mkfs.ext3"
+- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+- $(DESTDIR)$(root_sbindir)/mkfs.ext3
++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext3)
+ @echo " LINK $(root_sbindir)/e2label"
+- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+- $(DESTDIR)$(root_sbindir)/e2label
++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs e2label)
+ @echo " LINK $(root_sbindir)/findfs"
+- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+- $(DESTDIR)$(root_sbindir)/findfs
++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs findfs)
+ @for i in $(UPROGS); do \
+ echo " INSTALL $(bindir)/$$i"; \
+ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
+@@ -259,11 +255,9 @@
+ @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
+ $(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
+ @echo " LINK mkfs.ext2.8"
+- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+- $(DESTDIR)$(man8dir)/mkfs.ext2.8
++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext2.8)
+ @echo " LINK mkfs.ext3.8"
+- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+- $(DESTDIR)$(man8dir)/mkfs.ext3.8
++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8)
+ @for i in $(UMANPAGES); do \
+ $(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \
+ echo " INSTALL_DATA $(man1dir)/$$i"; \
+--- e2fsprogs-1.38/lib/uuid/Makefile.in.orig 2005-11-08 23:54:17.000000000 +0100
++++ e2fsprogs-1.38/lib/uuid/Makefile.in 2005-11-08 23:55:51.000000000 +0100
+@@ -146,9 +146,9 @@
+ @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
+ $(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
+ @echo " LINK $(man3dir)/uuid_generate_random.3"
+- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
++ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_random.3)
+ @echo " LINK $(man3dir)/uuid_generate_time.3"
+- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
++ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_time.3)
+ @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
+ @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
+
+--- e2fsprogs-1.38/e2fsck/Makefile.in.orig 2005-11-08 23:53:07.000000000 +0100
++++ e2fsprogs-1.38/e2fsck/Makefile.in 2005-11-08 23:53:43.000000000 +0100
+@@ -161,11 +161,9 @@
+ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
+ done
+ @echo " LINK $(root_sbindir)/fsck.ext2"
+- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+- $(DESTDIR)$(root_sbindir)/fsck.ext2
++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext2)
+ @echo " LINK $(root_sbindir)/fsck.ext3"
+- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+- $(DESTDIR)$(root_sbindir)/fsck.ext3
++ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3)
+ @for i in $(MANPAGES); do \
+ for j in $(COMPRESS_EXT); do \
+ $(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
+@@ -174,11 +172,9 @@
+ $(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
+ done
+ @echo " LINK $(man8dir)/fsck.ext2.8"
+- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+- $(DESTDIR)$(man8dir)/fsck.ext2.8
++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext2.8)
+ @echo " LINK $(man8dir)/fsck.ext3.8"
+- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+- $(DESTDIR)$(man8dir)/fsck.ext3.8
++ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8)
+
+ install-strip: install
+ @for i in $(PROGS); do \
diff --git a/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb b/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb
index 25d4ffbe0..199493dc1 100644
--- a/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/openembedded/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
HOMEPAGE = "http://e2fsprogs.sourceforge.net"
LICENSE = "GPL"
SECTION = "base"
-PR = "r1"
+PR = "r2"
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
+ file://no-hardlinks.patch;patch=1"
S = "${WORKDIR}/e2fsprogs-${PV}"
inherit autotools
@@ -34,17 +35,7 @@ do_stage () {
done
}
-pkg_postinst_e2fsprogs-e2fsck() {
- ln -s ${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext2
- ln -s ${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext3
-}
-
-pkg_postinst_e2fsprogs-mke2fs() {
- ln -s ${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext2
- ln -s ${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext3
-}
-
-PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
+PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck"
FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
-FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck"
-FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs"
+FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
+FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-25 20:51:27 +0000