linuxfirmware: install it along with pvops kernels

diff --git a/ap-common b/ap-common
index 31417b9fdd5996ef3809e1baf34de4fed6a22250..e1759170fafde86f4af8cedeb23bce5a77e76c33 100644 (file)
--- a/ap-common
+++ b/ap-common
@@ -37,6 +37,9 @@
 #: ${TREE_LINUX:=git://github.com/jsgf/linux-xen.git}
 : ${TAG_LINUX:=xen/next-2.6.32}
 
+: ${TREE_LINUXFIRMWARE:=git://xenbits.xen.org/osstest/linux-firmware.git}
+: ${PUSH_TREE_LINUXFIRMWARE:=$XENBITS:/home/osstest/ext/linux-firmware.git}
+
 : ${PUSH_TREE_LINUX:=$XENBITS:/home/xen/git/linux-pvops.git}
 : ${BASE_TREE_LINUX:=git://xenbits.xen.org/linux-pvops.git}
 : ${BASE_TAG_LINUX:=master}

diff --git a/ap-fetch-version b/ap-fetch-version
index a8b2e8546a718747f2edb218e0ce0cba7006c933..257547f4dc4d31c46bb748a0010d41a4bdcfae4a 100755 (executable)
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -65,6 +65,10 @@ linux-xen-*)
        repo_tree_rev_fetch_git linux \
                $TREE_LINUX xen/next-${branch#linux-xen-} $LOCALREV_LINUX
        ;;
+linuxfirmware)
+       repo_tree_rev_fetch_git linuxfirmware \
+               $UPSTREAM_TREE_LINUXFIRMWARE master daily-cron.$branch
+       ;;
 osstest)
        git-fetch $HOME/testing.git pretest:ap-fetch
         git-rev-parse ap-fetch^0

diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 7e3c0d737f6dcd2a95eb83d3f260f31cbf4a8d73..353a8174f949a529c9a2f6b243d4d41317b72af6 100755 (executable)
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -69,6 +69,10 @@ linux-xen-*)
        repo_tree_rev_fetch_git linux \
                $OLD_TREE_LINUX $branch $OLD_LOCALREV_LINUX
        ;;
+linuxfirmware)
+       repo_tree_rev_fetch_git linuxfirmware \
+               $TREE_LINUXFIRMWARE master daily-cron-old.$branch
+       ;;
 osstest)
        git-fetch -f $HOME/testing.git incoming:ap-fetch
         git-rev-parse ap-fetch^0

diff --git a/cr-daily-branch b/cr-daily-branch
index f4686160c995bd6b6155097d66e56b0fabe84e0a..81ab24583708895f1f13e4b98e5c4def16feab6a 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -119,6 +119,10 @@ if [ "x$REVISION_LINUX" = x ]; then
        determine_version REVISION_LINUX $linuxbranch LINUX
         export REVISION_LINUX
 fi
+if [ "x$REVISION_LINUXFIRMWARE" = x ]; then
+       determine_version REVISION_LINUXFIRMWARE linuxfirmware
+        export REVISION_LINUXFIRMWARE
+fi
 
 case "$tree" in
 xen)
@@ -142,6 +146,10 @@ qemuu)
        realtree=qemu-upstream-${xenbranch#xen-}
        NEW_REVISION=$REVISION_QEMU_UPSTREAM
         ;;
+linuxfirmware)
+       realtree=linuxfirmware
+       NEW_REVISION=$REVISION_LINUXFIRMWARE
+        ;;
 *)
        NEW_REVISION=''
        wantpush=false

diff --git a/make-flight b/make-flight
index 24bae477f5d88e6ee96212441241d4bfa1153293..d29016dc0de2bbef8d566194e5e64e5c5b93f8fa 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -77,7 +77,9 @@ if [ x$buildflight = x ]; then
                revision_xen=$REVISION_XEN                                   \
                tree_linux=$TREE_LINUX                                       \
                ${TREEVCS_LINUX:+treevcs_linux=}${TREEVCS_LINUX}        \
-               revision_linux=$REVISION_LINUX
+               revision_linux=$REVISION_LINUX                          \
+               tree_linuxfirmware=$TREE_LINUXFIRMWARE                       \
+               revision_linuxfirmware=$REVISION_LINUXFIRMWARE
 
     if [ "x$REVISION_LINUX_OLD" != xdisable ]; then
 

diff --git a/ts-kernel-build b/ts-kernel-build
index 2d6343978f6a7358e5f8e511dd48550e3bd0b1b9..38086922a5443cdef1f68769c3cc33eac599acb0 100755 (executable)
--- a/ts-kernel-build
+++ b/ts-kernel-build
@@ -46,6 +46,10 @@ sub checkout () {
             hg qpush -a
 END
     }
+
+    if ($r{tree_linuxfirmware}) {
+       build_clone($ho, 'linuxfirmware', $builddir, 'linux-firmware');
+    }
 }
 
 our $config_hardware= <<END;
@@ -263,8 +267,28 @@ END
 END
 }
 
+sub fwbuild () {
+    target_cmd_build($ho, 500, $builddir, <<END);
+       cd linux-firmware
+       make SHELL=/bin/bash all
+        echo ok.
+END
+}
+
+sub fwinstall () {
+    target_cmd_build($ho, 500, $builddir, <<END);
+       cd linux-firmware
+       make SHELL=/bin/bash DESTDIR=$builddir/dist install
+       echo ok.
+END
+}
+
 checkout();
 config();
 build();
 kinstall();
+if ($r{tree_linuxfirmware}) {
+    fwbuild();
+    fwinstall();
+}
 built_stash($ho, $builddir, 'dist', 'kerndist');