mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
Armin Kuster
d46d50c575
WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file Makefile
checking file configure
Hunk #3 succeeded at 232 (offset -4 lines).
Hunk #4 succeeded at 356 (offset -5 lines).
checking file src/vlock-main.c
Hunk #1 succeeded at 112 with fuzz 1 (offset 1 line).
Hunk #2 succeeded at 184 (offset 1 line).
Hunk #3 succeeded at 194 (offset 1 line).
Hunk #4 succeeded at 223 (offset 1 line).
among others
Signed-off-by: Armin Kuster <akuster808@gmail.com>
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From f71cc920528c3496b0118964ebbcf5440cda4ed1 Mon Sep 17 00:00:00 2001
|
|
From: Jackie Huang <jackie.huang@windriver.com>
|
|
Date: Wed, 16 Aug 2017 13:37:40 +0800
|
|
Subject: [PATCH] vlock: add new recipe
|
|
|
|
Upstream-Status: Inappropriate [configuration]
|
|
|
|
written by: Jeff Polk <jeff.polk@windriver.com>
|
|
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|
|
|
---
|
|
man/vlock.1 | 5 -----
|
|
src/vlock.sh | 5 -----
|
|
2 files changed, 10 deletions(-)
|
|
|
|
diff --git a/man/vlock.1 b/man/vlock.1
|
|
index 0d29b49..01cb944 100644
|
|
--- a/man/vlock.1
|
|
+++ b/man/vlock.1
|
|
@@ -111,11 +111,6 @@ enter your password at the password prompt. If this variable is unset or set
|
|
to an invalid value or 0 no timeout is used. \fBWarning\fR: If this value is
|
|
too low, you may not be able to unlock your session.
|
|
.PP
|
|
-.SH FILES
|
|
-.B ~/.vlockrc
|
|
-.IP
|
|
-This file is read by \fBvlock\fR on startup if it exists. All the variables
|
|
-mentioned above can be set here.
|
|
.SH SECURITY
|
|
See the SECURITY file in the \fBvlock\fR distribution for more information.
|
|
.PP
|
|
diff --git a/src/vlock.sh b/src/vlock.sh
|
|
index 75f1369..f572776 100644
|
|
--- a/src/vlock.sh
|
|
+++ b/src/vlock.sh
|
|
@@ -35,11 +35,6 @@ This TTY is now locked.
|
|
|
|
${VLOCK_ENTER_PROMPT}"
|
|
|
|
-# Read user settings.
|
|
-if [ -r "${HOME}/.vlockrc" ] ; then
|
|
- . "${HOME}/.vlockrc"
|
|
-fi
|
|
-
|
|
# "Compile" time variables.
|
|
VLOCK_MAIN="%PREFIX%/sbin/vlock-main"
|
|
VLOCK_VERSION="%VLOCK_VERSION%"
|