fdo#58909: Missing BAK_EXTENSIONS bootstrap variable

daeed90f "re-base on ALv2 code" had incorporated
from <http://svn.apache.org/viewvc?view=revision&revision=1172102> "imported
patch extensions_i117681.patch" the parts using BAK_EXTENSIONS in
desktop/source/deployment/manager/, but not the parts setting BAK_EXTENSIONS in
scp2/source/ooo/.

Also, setting the stamp for "bak" in PackageManagerImpl::create needed to be
adapted to bee742eb "Fix sense of r/o detection
code, and clean up" and 61eeb689 "fix smoketest
- need to check read-only-ness of non-existent paths."

Change-Id: If7cc363b3cf21fd13fb467f5f672eda5312515c8

desktop/source/deployment/manager/dp_manager.cxx

@@ -379,7 +379,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
         that->m_activePackages = "vnd.sun.star.expand:$BAK_EXTENSIONS/extensions";
         that->m_registrationData = "vnd.sun.star.expand:$BAK_EXTENSIONS";
         that->m_registryCache = "vnd.sun.star.expand:$BAK_EXTENSIONS/registry";
-        stamp = "vnd.sun.star.expand:$BAK_EXTENSIONS/stamp.sys";
+        stamp = "$BAK_EXTENSIONS";
     }
 
     else if (! context.match("vnd.sun.star.tdoc:/")) {

scp2/source/ooo/common_brand.scp

@@ -1180,6 +1180,14 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
     Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}";
 End
 
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bak_Extensions
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BAK_EXTENSIONS";
+    Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}";
+End
+
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;

scp2/source/ooo/profileitem_ooo.scp

@@ -166,6 +166,15 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
     Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
 End
 
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions
+    ProfileID = gid_Profile_Uno_Ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "BAK_EXTENSIONS";
+    Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak";
+End
+
 ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
     ProfileID = gid_Profile_Uno_Ini;
     ModuleID = gid_Module_Root;