summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2016-07-03 00:19:36 +0300
committerThomas Backlund <tmb@mageia.org>2016-07-03 00:19:36 +0300
commit601d5caab80d36e0834dc58838f7f1c4dfd6bf42 (patch)
tree017578afd624055574c8ce00229ae37a2c3c28f6
parent291090d23972f5d6ff62de23805ace8960fa0fa0 (diff)
downloaddraklive-config-601d5caab80d36e0834dc58838f7f1c4dfd6bf42.tar
draklive-config-601d5caab80d36e0834dc58838f7f1c4dfd6bf42.tar.gz
draklive-config-601d5caab80d36e0834dc58838f7f1c4dfd6bf42.tar.bz2
draklive-config-601d5caab80d36e0834dc58838f7f1c4dfd6bf42.tar.xz
draklive-config-601d5caab80d36e0834dc58838f7f1c4dfd6bf42.zip
live media: list core before nonfree
-rwxr-xr-xfiles/mga_rpms/update_media.sh26
1 files changed, 13 insertions, 13 deletions
diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh
index 866fe9e..627c50f 100755
--- a/files/mga_rpms/update_media.sh
+++ b/files/mga_rpms/update_media.sh
@@ -8,19 +8,6 @@ mkdir -p {i586,x86_64}/mga_rpms/{core,nonfree}/media_info
rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/*.rpm
rm -f {i586,x86_64}/mga_rpms/{core,nonfree}/media_info/*
-# add broadcom-wl
-cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-common*.rpm i586/mga_rpms/nonfree/
-cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-kernel-*-desktop586-*.rpm i586/mga_rpms/nonfree/
-cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-kernel-desktop586-latest-*.rpm i586/mga_rpms/nonfree/
-
-cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-common-*.rpm x86_64/mga_rpms/nonfree/
-cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-kernel-*-desktop-*.rpm x86_64/mga_rpms/nonfree/
-cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-kernel-desktop-latest-*.rpm x86_64/mga_rpms/nonfree/
-
-# add broadcom wireless configs
-cp $bcdmedia/i586/media/core/release/broadcom-*-config-*.rpm i586/mga_rpms/core/
-cp $bcdmedia/x86_64/media/core/release/broadcom-*-config-*.rpm x86_64/mga_rpms/core/
-
# add grub2 stuff
cp $bcdmedia/i586/media/core/release/grub2-2*.rpm i586/mga_rpms/core/
cp $bcdmedia/i586/media/core/release/grub2-common-2*.rpm i586/mga_rpms/core/
@@ -40,6 +27,19 @@ cp $bcdmedia/x86_64/media/core/release/efibootmgr-*.rpm x86_64/mga_rpms/core/
cp $bcdmedia/x86_64/media/core/release/efivar-*.rpm x86_64/mga_rpms/core/
cp $bcdmedia/x86_64/media/core/release/lib64efivar0-*.rpm x86_64/mga_rpms/core/
+# add broadcom-wl
+cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-common*.rpm i586/mga_rpms/nonfree/
+cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-kernel-*-desktop586-*.rpm i586/mga_rpms/nonfree/
+cp $bcdmedia/i586/media/nonfree/release/broadcom-wl-kernel-desktop586-latest-*.rpm i586/mga_rpms/nonfree/
+
+cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-common-*.rpm x86_64/mga_rpms/nonfree/
+cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-kernel-*-desktop-*.rpm x86_64/mga_rpms/nonfree/
+cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-kernel-desktop-latest-*.rpm x86_64/mga_rpms/nonfree/
+
+# add broadcom wireless configs
+cp $bcdmedia/i586/media/core/release/broadcom-*-config-*.rpm i586/mga_rpms/core/
+cp $bcdmedia/x86_64/media/core/release/broadcom-*-config-*.rpm x86_64/mga_rpms/core/
+
# add repo pubkeys
cp $bcdmedia/i586/media/core/release/media_info/pubkey i586/mga_rpms/core/media_info/
cp $bcdmedia/x86_64/media/core/release/media_info/pubkey x86_64/mga_rpms/core/media_info/