[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH 10/29] Fix up copying of firmware.



why did you remove the /lib/firmware to /firmware and /lib/modules to /modules symlink? is it not needed?

don't we rather have the modules and firmware reside in their original directory /lib? or is that causing some other problems?
what about keeping them in /lib, and making a symlink the other way, meaning /firmware linking to /lib/firmware, and the same for modules.

--

  Martin Gracik

----- "Chris Lumens" <clumens redhat com> wrote:

> ---
>  scripts/mk-images    |   12 ++++++------
>  scripts/upd-instroot |    2 --
>  2 files changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/scripts/mk-images b/scripts/mk-images
> index 031c6e2..3b0f918 100755
> --- a/scripts/mk-images
> +++ b/scripts/mk-images
> @@ -301,7 +301,7 @@ makemoduletree() {
>      echo "Copying required firmware..."
>      find $MMB_DIR/lib/modules/ -name *.ko | while read module ; do
>          for fw in $(modinfo -F firmware $module); do
> -            dest=$MBD_DIR/firmware/$fw
> +            dest=$MMB_DIR/firmware/$fw
>              destdir=$(dirname $dest)
>  
>              # Some firmware files are expected to be in their own
> directories.
> @@ -319,19 +319,19 @@ makemoduletree() {
>      for module in $MODSET ; do
>          case $module in
>              ipw2100)
> -                cp $KERNELROOT/lib/firmware/ipw2100*
> $MBD_DIR/firmware
> +                cp $KERNELROOT/lib/firmware/ipw2100*
> $MMB_DIR/firmware
>              ;;
>              ipw2200)
> -                cp $KERNELROOT/lib/firmware/ipw2200*
> $MBD_DIR/firmware
> +                cp $KERNELROOT/lib/firmware/ipw2200*
> $MMB_DIR/firmware
>              ;;
>              iwl3945)
> -                cp $KERNELROOT/lib/firmware/iwlwifi-3945*
> $MBD_DIR/firmware
> +                cp $KERNELROOT/lib/firmware/iwlwifi-3945*
> $MMB_DIR/firmware
>              ;;
>              atmel)
> -                cp $KERNELROOT/lib/firmware/atmel_*.bin
> $MBD_DIR/firmware
> +                cp $KERNELROOT/lib/firmware/atmel_*.bin
> $MMB_DIR/firmware
>              ;;
>              zd1211rw)
> -                cp -r $KERNELROOT/lib/firmware/zd1211
> $MBD_DIR/firmware
> +                cp -r $KERNELROOT/lib/firmware/zd1211
> $MMB_DIR/firmware
>              ;;
>          esac
>      done
> diff --git a/scripts/upd-instroot b/scripts/upd-instroot
> index 730b102..d059aa0 100755
> --- a/scripts/upd-instroot
> +++ b/scripts/upd-instroot
> @@ -1295,8 +1295,6 @@ sed -i "s,^MANPATH[^_MAP][ \t]*,&/mnt/sysimage,"
> $DEST/etc/man_db.conf
>  sed -i "s,^MANPATH_MAP[ \t]*[a-zA-Z0-9/]*[ \t]*,&/mnt/sysimage,"
> $DEST/etc/man_db.conf
>  
>  echo "Scrubbing tree..." "$DEST"
> -ln -snf /modules $DEST/lib/modules
> -ln -snf /firmware $DEST/lib/firmware
>  
>  mv $DEST/etc/yum.repos.d $DEST/etc/anaconda.repos.d
>  
> -- 
> 1.7.1.1
> 
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list redhat com
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]