summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb3
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp3.inc4
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp4.inc4
-rw-r--r--meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb2
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.5.bb5
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb29
-rw-r--r--meta/recipes-core/base-passwd/base-passwd_3.5.22.bb7
-rw-r--r--meta/recipes-core/busybox/busybox.inc3
-rw-r--r--meta/recipes-core/busybox/busybox_1.18.4.bb2
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc2
-rw-r--r--meta/recipes-core/dropbear/dropbear_0.52.bb2
-rw-r--r--meta/recipes-core/netbase/netbase-4.45/colinux/interfaces8
-rw-r--r--meta/recipes-core/netbase/netbase-4.45/openmn/hosts2
-rw-r--r--meta/recipes-core/netbase/netbase-4.45/openmn/interfaces10
-rw-r--r--meta/recipes-core/netbase/netbase_4.45.bb5
-rw-r--r--meta/recipes-core/udev/files/slugos/mount.blacklist4
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc1
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb2
-rw-r--r--meta/recipes-devtools/perl/perl-native_5.12.3.bb8
-rwxr-xr-xmeta/recipes-kernel/update-modules/update-modules-1.0/openmn/update-modules3
-rw-r--r--meta/recipes-kernel/update-modules/update-modules_1.0.bb11
21 files changed, 10 insertions, 107 deletions
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb b/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
index d647f68..f783a85 100644
--- a/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
+++ b/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
@@ -6,8 +6,7 @@ HOMEPAGE = "http://www.openswan.org"
6LICENSE = "GPLv2" 6LICENSE = "GPLv2"
7DEPENDS = "gmp flex-native" 7DEPENDS = "gmp flex-native"
8RRECOMMENDS_${PN} = "kernel-module-ipsec" 8RRECOMMENDS_${PN} = "kernel-module-ipsec"
9RDEPENDS_${PN}_nylon = "perl" 9PR = "r2"
10PR = "r1"
11 10
12SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \ 11SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
13 file://openswan-2.4.7-gentoo.patch;patch=1 \ 12 file://openswan-2.4.7-gentoo.patch;patch=1 \
diff --git a/meta/recipes-connectivity/dhcp/dhcp3.inc b/meta/recipes-connectivity/dhcp/dhcp3.inc
index 3f68f45..6c7483e 100644
--- a/meta/recipes-connectivity/dhcp/dhcp3.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp3.inc
@@ -47,7 +47,3 @@ FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${
47RDEPENDS_dhcp-client = "bash" 47RDEPENDS_dhcp-client = "bash"
48 48
49FILES_dhcp-omshell = "${bindir}/omshell" 49FILES_dhcp-omshell = "${bindir}/omshell"
50
51CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf"
52CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay"
53CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf"
diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
index e7cff3e..159ae89 100644
--- a/meta/recipes-connectivity/dhcp/dhcp4.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
@@ -60,7 +60,3 @@ FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${
60RDEPENDS_dhcp-client = "bash" 60RDEPENDS_dhcp-client = "bash"
61 61
62FILES_dhcp-omshell = "${bindir}/omshell" 62FILES_dhcp-omshell = "${bindir}/omshell"
63
64CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf"
65CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay"
66CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index c273b2c..85f473d 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
@@ -1,6 +1,6 @@
1require dhcp4.inc 1require dhcp4.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI += "file://fixincludes.patch \ 5SRC_URI += "file://fixincludes.patch \
6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \ 6 file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
index bbbcb32..785eab1 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77
10 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ 10 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
11 file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ 11 file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
12 file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" 12 file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
13PR = "r0" 13PR = "r1"
14 14
15SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ 15SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
16 file://makefile.patch \ 16 file://makefile.patch \
@@ -29,8 +29,6 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
29SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57" 29SRC_URI[md5sum] = "4621bc56167b6953ec4071043fe0ec57"
30SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505" 30SRC_URI[sha256sum] = "43317afec9299f9920b96f840414c977f0385410202d48e56d2fdb8230003505"
31 31
32SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
33
34inherit autotools 32inherit autotools
35 33
36EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin" 34EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin"
@@ -54,7 +52,6 @@ do_install_append () {
54CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" 52CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
55PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" 53PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
56FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd" 54FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd"
57FILES_${PN}_nylon = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd /usr/sbin/tdbread"
58FILES_${PN}-dbg += "${libdir}/pppd/2.4.3/.debug" 55FILES_${PN}-dbg += "${libdir}/pppd/2.4.3/.debug"
59FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so" 56FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so"
60FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so" 57FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so"
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 1c5078e..4445081 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -63,8 +63,6 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
63# set standard hostname, might be a candidate for a DISTRO variable? :M: 63# set standard hostname, might be a candidate for a DISTRO variable? :M:
64# 64#
65hostname = "openembedded" 65hostname = "openembedded"
66hostname_slugos = "nslu2"
67hostname_jlime = "JLime"
68 66
69BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" 67BASEFILESISSUEINSTALL ?= "do_install_basefilesissue"
70 68
@@ -133,22 +131,6 @@ do_install_basefilesissue () {
133 fi 131 fi
134} 132}
135 133
136do_install_append_nylon() {
137 printf "" "" >${D}${sysconfdir}/resolv.conf
138 rm -r ${D}/mnt/*
139 rm -r ${D}/media
140 rm -rf ${D}/tmp
141 ln -sf /var/tmp ${D}/tmp
142}
143
144do_install_append_slugos() {
145 printf "" "" >${D}${sysconfdir}/resolv.conf
146 rm -r ${D}/mnt/*
147 rmdir ${D}/home/root
148 install -m 0755 -d ${D}/root
149 ln -s ../root ${D}/home/root
150}
151
152do_install_append_linuxstdbase() { 134do_install_append_linuxstdbase() {
153 for d in ${dirs3755}; do 135 for d in ${dirs3755}; do
154 install -m 0755 -d ${D}$d 136 install -m 0755 -d ${D}$d
@@ -165,16 +147,5 @@ FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
165 147
166PACKAGE_ARCH = "${MACHINE_ARCH}" 148PACKAGE_ARCH = "${MACHINE_ARCH}"
167 149
168# Unslung distribution specific packaging
169
170PACKAGES_unslung = "${PN}-unslung"
171PACKAGE_ARCH_${PN}-unslung = "nslu2"
172RDEPENDS_${PN}-unslung = "nslu2-linksys-ramdisk"
173RPROVIDES_${PN}-unslung = "${PN}"
174
175FILES_${PN}-unslung = ""
176
177CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname" 150CONFFILES_${PN} = "${sysconfdir}/fstab ${sysconfdir}/hostname"
178CONFFILES_${PN}_nylon = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
179CONFFILES_${PN}_slugos = "${sysconfdir}/resolv.conf ${sysconfdir}/fstab ${sysconfdir}/hostname"
180 151
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
index aed8491..6f768ca 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.22.bb
@@ -1,7 +1,7 @@
1SUMMARY = "Base system master password/group files." 1SUMMARY = "Base system master password/group files."
2DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group). The update-passwd tool is also provided to keep the system databases synchronized with these master files." 2DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group). The update-passwd tool is also provided to keep the system databases synchronized with these master files."
3SECTION = "base" 3SECTION = "base"
4PR = "r0" 4PR = "r1"
5LICENSE = "GPLv2+" 5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" 6LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
7 7
@@ -35,11 +35,6 @@ do_install () {
35 install -p -m 644 debian/copyright ${D}${docdir}/${PN}/ 35 install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
36} 36}
37 37
38do_install_append_openmn() {
39 echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
40}
41
42
43pkg_postinst_${PN} () { 38pkg_postinst_${PN} () {
44 set -e 39 set -e
45 40
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 9f2d64c..be13c8a 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -29,9 +29,6 @@ CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}"
29 29
30RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" 30RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
31 31
32# This disables the syslog startup links in slugos (see slugos-init)
33INITSCRIPT_PARAMS_${PN}-syslog_slugos = "start 20 ."
34
35inherit cml1 update-rc.d 32inherit cml1 update-rc.d
36 33
37do_configure () { 34do_configure () {
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index 696a4db..5f5c2ae 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
1require busybox.inc 1require busybox.inc
2PR = "r0" 2PR = "r1"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \ 5 file://udhcpscript.patch \
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 08be70e..e9290ff 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -33,7 +33,7 @@ EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
33DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" 33DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
34 34
35do_configure_prepend() { 35do_configure_prepend() {
36 if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" = "debug" ]; then 36 if [ "${DISTRO_TYPE}" = "debug" ]; then
37 bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!" 37 bbnote "WARNING: applying allow-nopw.patch which allows password-less logins!"
38 patch -p1 < ${WORKDIR}/allow-nopw.patch 38 patch -p1 < ${WORKDIR}/allow-nopw.patch
39 fi 39 fi
diff --git a/meta/recipes-core/dropbear/dropbear_0.52.bb b/meta/recipes-core/dropbear/dropbear_0.52.bb
index 6556bb4..912054c 100644
--- a/meta/recipes-core/dropbear/dropbear_0.52.bb
+++ b/meta/recipes-core/dropbear/dropbear_0.52.bb
@@ -3,4 +3,4 @@ require dropbear.inc
3SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e" 3SRC_URI[md5sum] = "1c69ec674481d7745452f68f2ea5597e"
4SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108" 4SRC_URI[sha256sum] = "e3a2ca49ed85ce562240c0ac06e2f72826d7e52a83e80d91c067c8b97bf5c108"
5 5
6PR="r0" 6PR = "r1"
diff --git a/meta/recipes-core/netbase/netbase-4.45/colinux/interfaces b/meta/recipes-core/netbase/netbase-4.45/colinux/interfaces
deleted file mode 100644
index 0e495e1..0000000
--- a/meta/recipes-core/netbase/netbase-4.45/colinux/interfaces
+++ /dev/null
@@ -1,8 +0,0 @@
1# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
2
3# The loopback interface
4auto lo
5iface lo inet loopback
6
7# Wired or wireless interfaces
8iface eth0 inet dhcp
diff --git a/meta/recipes-core/netbase/netbase-4.45/openmn/hosts b/meta/recipes-core/netbase/netbase-4.45/openmn/hosts
deleted file mode 100644
index 0205b98..0000000
--- a/meta/recipes-core/netbase/netbase-4.45/openmn/hosts
+++ /dev/null
@@ -1,2 +0,0 @@
1127.0.0.1 localhost.localdomain localhost
2192.168.233.1 www.mn-solutions.de
diff --git a/meta/recipes-core/netbase/netbase-4.45/openmn/interfaces b/meta/recipes-core/netbase/netbase-4.45/openmn/interfaces
deleted file mode 100644
index 9ebe9b8..0000000
--- a/meta/recipes-core/netbase/netbase-4.45/openmn/interfaces
+++ /dev/null
@@ -1,10 +0,0 @@
1auto lo
2auto eth1
3
4iface lo inet loopback
5
6iface eth0 inet dhcp
7
8iface eth1 inet dhcp
9 wireless_mode managed
10 wireless_essid any
diff --git a/meta/recipes-core/netbase/netbase_4.45.bb b/meta/recipes-core/netbase/netbase_4.45.bb
index 85daa16..04ef3a0 100644
--- a/meta/recipes-core/netbase/netbase_4.45.bb
+++ b/meta/recipes-core/netbase/netbase_4.45.bb
@@ -10,11 +10,6 @@ inherit update-rc.d
10 10
11INITSCRIPT_NAME = "networking" 11INITSCRIPT_NAME = "networking"
12INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." 12INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ."
13# On MNCI etc, start very late so that our own apps come up faster
14INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ."
15# On SlugOS (NSLU2) delay the stop until after network apps have exited
16# Do not stop in single user - there's no way to sulogin!
17INITSCRIPT_PARAMS_slugos = "start 42 S 0 6 ."
18 13
19SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \ 14SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \
20 file://init \ 15 file://init \
diff --git a/meta/recipes-core/udev/files/slugos/mount.blacklist b/meta/recipes-core/udev/files/slugos/mount.blacklist
deleted file mode 100644
index 210702f..0000000
--- a/meta/recipes-core/udev/files/slugos/mount.blacklist
+++ /dev/null
@@ -1,4 +0,0 @@
1ram[0-9]$
2mtdblock[0-9]$
3hd[a-z]$
4sd[a-z]$
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 6a04997..0284442 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -17,7 +17,6 @@ PARALLEL_MAKE = ""
17inherit autotools gettext 17inherit autotools gettext
18 18
19DPKG_INIT_POSITION = "98" 19DPKG_INIT_POSITION = "98"
20DPKG_INIT_POSITION_slugos = "41"
21 20
22pkg_postinst_dpkg () { 21pkg_postinst_dpkg () {
23#!/bin/sh 22#!/bin/sh
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb b/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
index 8df960d..8bb441f 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
@@ -8,7 +8,7 @@ SRC_URI += "file://noman.patch;patch=1 \
8SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc" 8SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
9SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5" 9SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
10 10
11PR = "r1" 11PR = "r2"
12 12
13EXTRA_OECONF = "--without-static-progs \ 13EXTRA_OECONF = "--without-static-progs \
14 --without-dselect \ 14 --without-dselect \
diff --git a/meta/recipes-devtools/perl/perl-native_5.12.3.bb b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
index 0476bdf..f477679 100644
--- a/meta/recipes-devtools/perl/perl-native_5.12.3.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.12.3.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
4LICENSE = "Artistic|GPL" 4LICENSE = "Artistic|GPL"
5LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ 5LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
6 file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" 6 file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
7PR = "r1" 7PR = "r2"
8 8
9LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \ 9LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
10 file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8" 10 file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
@@ -98,9 +98,3 @@ do_install () {
98 98
99 create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/' 99 create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
100} 100}
101do_install_append_nylon() {
102 # get rid of definitions not supported by the gcc version we use for nylon...
103 for i in ${D}${libdir}/perl/${PV}/Config_heavy.pl ${D}${libdir}/perl/config.sh; do
104 perl -pi -e 's/-Wdeclaration-after-statement //g' ${i}
105 done
106}
diff --git a/meta/recipes-kernel/update-modules/update-modules-1.0/openmn/update-modules b/meta/recipes-kernel/update-modules/update-modules-1.0/openmn/update-modules
deleted file mode 100755
index 976161f..0000000
--- a/meta/recipes-kernel/update-modules/update-modules-1.0/openmn/update-modules
+++ /dev/null
@@ -1,3 +0,0 @@
1#!/bin/sh
2depmod -ae
3exit 0
diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
index a8ebbda..336bca2 100644
--- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb
+++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa
5 5
6PACKAGE_ARCH = "all" 6PACKAGE_ARCH = "all"
7RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " 7RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} "
8PR = "r8" 8PR = "r9"
9 9
10SRC_URI = "file://update-modules \ 10SRC_URI = "file://update-modules \
11 file://COPYING.GPL" 11 file://COPYING.GPL"
@@ -22,12 +22,3 @@ do_install() {
22 install ${WORKDIR}/update-modules ${D}${sbindir} 22 install ${WORKDIR}/update-modules ${D}${sbindir}
23} 23}
24 24
25# The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which
26# supports both 2.4 and 2.6 kernels. Rather than forcing OE to have
27# to deal with that unique legacy corner case, we just nullify the
28# RDEPENDS_${PN} here and handle it in the Unslung image recipe. I know this
29# is ugly. Please don't remove it unless you first make the RDEPENDS
30# line at the top of this file understand that a machine can be used
31# in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's
32# not worth the effort to do that, so just overlook the next line.
33RDEPENDS_unslung = ""