From 1ab005c73d8bed6852b88e8bb3ec7c5c7c401ad7 Mon Sep 17 00:00:00 2001 From: geos_one Date: Tue, 26 Oct 2010 19:09:07 +0000 Subject: [PATCH] correct a small bug on circular dependency git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@2598 6952d904-891a-0410-993b-d76249ca496b --- Documentation/ls_pro_live/armv5tejl-stage4.spec | 2 +- eclass/nas-kernel.eclass | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/ls_pro_live/armv5tejl-stage4.spec b/Documentation/ls_pro_live/armv5tejl-stage4.spec index 52ef32b..dd1b016 100644 --- a/Documentation/ls_pro_live/armv5tejl-stage4.spec +++ b/Documentation/ls_pro_live/armv5tejl-stage4.spec @@ -92,7 +92,7 @@ stage4/use: # then it will be defined elsewhere. # example: # stage4/packages: livecd-tools dhcpcd acpid apmd gentoo-sources coldplug fxload irssi gpm syslog-ng parted links raidtools dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs ntfsprogs pwgen rp-pppoe screen mirrorselect penggy iputils hwdata-knoppix hwsetup lvm2 evms vim pptpclient mdadm ethtool wireless-tools prism54-firmware wpa_supplicant -stage4/packages: openssh dhcpcd micro_evtd linux-buffalo_ls_pro_live buffalo_ls_pro_live-sources sim_buffalo gpm syslog-ng gdisk parted links dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs reiser4progs ntfsprogs pwgen screen mirrorselect iputils lvm2 vim mdadm ethtool ntp smartmontools hddtemp +stage4/packages: openssh dhcpcd micro_evtd linux-buffalo_ls_pro_live gpm syslog-ng gdisk parted links dosfstools nfs-utils jfsutils xfsprogs e2fsprogs reiserfsprogs reiser4progs pwgen screen mirrorselect iputils lvm2 vim mdadm ethtool ntp smartmontools hddtemp # A fsscript is simply a shell script that is copied into the chroot of the stage4 # after the kernel(s) and any external modules have been compiled and is diff --git a/eclass/nas-kernel.eclass b/eclass/nas-kernel.eclass index 247190a..2aec869 100644 --- a/eclass/nas-kernel.eclass +++ b/eclass/nas-kernel.eclass @@ -162,7 +162,9 @@ else app-arch/xz-utils sys-kernel/genkernel sys-block/devio - dev-embedded/u-boot-tools + dev-embedded/u-boot-tools" + # rdepend app-admin/nas-eselct + RDEPEND="sys-apps/sed >=sys-kernel/linux-firmwares-${PV}" fi