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

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

2005/01/08 15:17:40+01:00 mn-solutions.de!schurig
make sure all scripts in /etc/pcmcia are executable (network and another on weren't)

2005/01/08 15:15:51+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/01/08 15:15:27+01:00 mn-solutions.de!schurig
make sure that depmod.26 in module-init-tools-depmod will be handled by update-alternatives

BKrev: 41dff0c6siKawYOLdWTa8rCAlikf4w

diff --git a/packages/module-init-tools/module-init-tools_3.1-pre5.bb b/packages/module-init-tools/module-init-tools_3.1-pre5.bb
index 3869f3a..1fc882a 100644 (file)
--- a/packages/module-init-tools/module-init-tools_3.1-pre5.bb
+++ b/packages/module-init-tools/module-init-tools_3.1-pre5.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
 removing kernel modules for Linux (versions 2.5.48 and above). It serves \
 the same function that the modutils package serves for Linux 2.4."
-PR = "r4"
+PR = "r5"
 
 PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
 RDEPENDS_${PN} += "module-init-tools-depmod"
@@ -45,3 +45,12 @@ bn=`basename $f`
 done
 }
 
+pkg_postinst_module-init-tools-depmod() {
+#!/bin/sh
+update-alternatives --install /sbin/depmod depmod.26 /sbin/depmod.26 20
+}
+
+pkg_prerm_module-init-tools() {
+#!/bin/sh
+update-alternatives --remove depmod /sbin/debmod.26
+}

diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 320bbca..2553d9c 100644 (file)
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-PR = "r11"
+PR = "r12"
 
 PACKAGES =+ "${PN}-ftl ${PN}-pcinitrd"
 
@@ -74,7 +74,7 @@ do_install() {
        install -m 0644 ${WORKDIR}/wnv.conf ${D}/${sysconfdir}/pcmcia/
 
        for i in ${INSTALL_ETC}; do
-               install etc/${i} ${D}/${sysconfdir}/pcmcia/
+               install -m 0755 etc/${i} ${D}/${sysconfdir}/pcmcia/
        done
        for i in ${INSTALL_ETC_DATA}; do
                install -m 0644 etc/${i} ${D}/${sysconfdir}/pcmcia/