Skip to contentSkip to conversation

Added usrmerge to distro-features for Bug 13494

PATCH New Mark Morton 1 participant 2 messages Apr 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Added usrmerge to distro-features for Bug 13494

From: mmorton <[email protected]>

---
 documentation/ref-manual/ref-features.xml | 6 ++++++
 1 file changed, 6 insertions(+)
documentation/ref-manual/ref-features.xml +6 -0
index 44ba67cf5..294b297c2 100644
@@ -210,6 +210,12 @@
                 <listitem><para><emphasis>usbhost:</emphasis> Include USB Host
                     support (allows to connect external keyboard, mouse,
                     storage, network etc).</para></listitem>
+                <listitem><para><emphasis>usrmerge:</emphasis> Merges the 
+                    <filename>/bin</filename>, <filename>/sbin</filename>, 
+                    <filename>/lib</filename>, and <filename>/lib64</filename>       
+                    directories into their respective counterparts in the 
+                    <filename>/usr</filename> directory to provide better package 
+                   and application compatibility.</para></listitem>
                 <listitem><para><emphasis>wayland:</emphasis> Include the
                     Wayland display server protocol and the library that
                     supports it.</para></listitem>
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 Updated patch for publishing

---
 documentation/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
documentation/Makefile +2 -2
index 1a33c771f..15644bf92 100644
@@ -419,8 +419,8 @@ publish:
             echo " "; \
             echo "******** Publishing "$(DOC)".html"; \
             echo " "; \
-            scp -r $(MANUALS) $(STYLESHEET) docs.yp:/var/www/www.yoctoproject.org-docs/$(VER)/$(DOC); \
-            cd $(DOC); scp -r $(FIGURES) docs.yp:/var/www/www.yoctoproject.org-docs/$(VER)/$(DOC); \
+            scp -r $(MANUALS) $(STYLESHEET) www.yoctoproject.org:/var/www/www.yoctoproject.org-docs/$(VER)/$(DOC); \
+            cd $(DOC); scp -r $(FIGURES) www.yoctoproject.org:/var/www/www.yoctoproject.org-docs/$(VER)/$(DOC); \
 	else \
           echo " "; \
           echo $(DOC)".html missing.  Generate the file first then try again."; \
Signature · 1 line
2.17.1