Skip to contentSkip to conversation

meta-selinux patch doesn't apply cleanly

PATCH Philip Tricca 1 participant 1 message Jun 11, 2013

lore
Share & tools
lore
#0 lore raw

Hello Mark / Xin,

I built the dylan branch of meta-selinux against the oe-core dylan branch today and ran into a minor issue. The findutils-with-selinux patch doesn't apply cleanly. The fix-up is very small and just requires fixing one blob. Looks like the docs have changed a bit.

There's a patch below if you're interested. These may be appropriate for the master branch as well but I've only tested against the dylan release branch.

Regards,
- Philip

From: Philip Tricca <[email protected]>
Date: Mon, 10 Jun 2013 20:30:15 -0400
Subject: [PATCH 1/2] Fix doc menu blob in findutils-with-selinux.patch.

---
 .../findutils/findutils-4.4.2/findutils-with-selinux.patch         |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-extended/findutils/findutils-4.4.2/findutils-with-selinux.patch +2 -2
index 9597b09..e38f53f 100644
@@ -66,14 +66,14 @@ index 391ffa0..f599bbc 100644
  @node Contents
  @section Contents
  
-@@ -1733,6 +1740,7 @@ from the novel you are reading.
+@@ -1734,6 +1741,7 @@ from the novel you are reading.
  * Size Directives::
  * Location Directives::
  * Time Directives::
 +* Other Directives::
- * Formatting Flags::
  @end menu
  
+ @node Name Directives
 @@ -1890,6 +1898,14 @@ File's last modification time in the format specified by @var{k}
  (@pxref{Time Formats}).
  @end table
Signature · 1 line
1.7.10.4