diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-02-26 00:49:16 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-02-26 00:49:16 +0000 |
| commit | 3c7fe1b1fbc565ebd8e5f6aa1623741711f9ac68 (patch) | |
| tree | 8c397595997c79d057578b895025ff6576642745 | |
| parent | 1288e80ac1b58b6c14a6bfb8499cc1dec7e85249 (diff) | |
| parent | 64eb8308d57862983828fbadedf85e7bb59e36c7 (diff) | |
merge of '6257d463f8bb66aa3012de1dace0e36e69fc91a3'
and '8d3c7f116675cb37e5e2e8c85c699a0c793dd6bb'
| -rw-r--r-- | conf/machine/mpc8313e-rdb.conf | 4 | ||||
| -rw-r--r-- | conf/machine/mpc8323e-rdb.conf | 2 | ||||
| -rw-r--r-- | packages/udev/files/network.sh | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index a43f621406..31f13b00b6 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -5,8 +5,8 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c3" -PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_u-boot = "git" +PREFERRED_PROVIDER_virtual/kernel ?= "linux" +PREFERRED_VERSION_u-boot ?= "git" MACHINE_FEATURES = "kernel26 usbhost ext2" diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf index 38f3b1930c..db1a7ccf16 100644 --- a/conf/machine/mpc8323e-rdb.conf +++ b/conf/machine/mpc8323e-rdb.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "powerpc" TARGET_FPU ?= "soft" PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c2" -PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel ?= "linux" MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" diff --git a/packages/udev/files/network.sh b/packages/udev/files/network.sh index 5016328df4..182c26d86a 100644 --- a/packages/udev/files/network.sh +++ b/packages/udev/files/network.sh @@ -1,5 +1,8 @@ #!/bin/sh +# udevd does clearenv(). Export shell PATH to children. +export PATH + # Do not run when pcmcia-cs is installed test -x /sbin/cardctl && exit 0 |