mirror of
https://git.yoctoproject.org/poky
synced 2026-04-29 09:32:11 +02:00
base-passwd: Regenerate the patches
(From OE-Core rev: 6515d96c12b080b9e7f344799e26dba3b98e17e2) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt
committed by
Richard Purdie
Richard Purdie
parent
d5f64c38f1
commit
126e039eef
@@ -0,0 +1,26 @@
|
||||
From 8f3ace87df3aaad85946c22cae240532ea3e73b8 Mon Sep 17 00:00:00 2001
|
||||
From: Saul Wold <sgw@linux.intel.com>
|
||||
Date: Fri, 29 Apr 2022 13:32:27 +0000
|
||||
Subject: [PATCH] Add a shutdown group
|
||||
|
||||
We need to have a shutdown group to allow the shutdown icon to work
|
||||
correctly. Any users that want to use shutdown like the xuser should
|
||||
be added to this group.
|
||||
|
||||
Upstream-Status: Inappropriate [Embedded]
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
---
|
||||
group.master | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/group.master b/group.master
|
||||
index ad1dd2d..1b5e2fb 100644
|
||||
--- a/group.master
|
||||
+++ b/group.master
|
||||
@@ -35,5 +35,6 @@ sasl:*:45:
|
||||
plugdev:*:46:
|
||||
staff:*:50:
|
||||
games:*:60:
|
||||
+shutdown:*:70:
|
||||
users:*:100:
|
||||
nogroup:*:65534:
|
||||
@@ -0,0 +1,23 @@
|
||||
From 4411fc0df77566d52bee11ec0bad4be30a96e99e Mon Sep 17 00:00:00 2001
|
||||
From: Scott Garman <scott.a.garman@intel.com>
|
||||
Date: Fri, 29 Apr 2022 13:32:27 +0000
|
||||
Subject: [PATCH] Use /bin/sh instead of /bin/bash for the root user
|
||||
|
||||
/bin/bash may not be included in some images such as minimal.
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
||||
---
|
||||
passwd.master | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/passwd.master b/passwd.master
|
||||
index a01a6aa..b54ff51 100644
|
||||
--- a/passwd.master
|
||||
+++ b/passwd.master
|
||||
@@ -1,4 +1,4 @@
|
||||
-root:*:0:0:root:/root:/bin/bash
|
||||
+root:*:0:0:root:/root:/bin/sh
|
||||
daemon:*:1:1:daemon:/usr/sbin:/bin/sh
|
||||
bin:*:2:2:bin:/bin:/bin/sh
|
||||
sys:*:3:3:sys:/dev:/bin/sh
|
||||
@@ -0,0 +1,21 @@
|
||||
From 13a1a284a134d18a454625a5b4485c0d99079ae9 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Garman <scott.a.garman@intel.com>
|
||||
Date: Fri, 29 Apr 2022 13:32:28 +0000
|
||||
Subject: [PATCH] Remove "*" for root since we do not have an /etc/shadow
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
||||
---
|
||||
passwd.master | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/passwd.master b/passwd.master
|
||||
index b54ff51..e1c32ff 100644
|
||||
--- a/passwd.master
|
||||
+++ b/passwd.master
|
||||
@@ -1,4 +1,4 @@
|
||||
-root:*:0:0:root:/root:/bin/sh
|
||||
+root::0:0:root:/root:/bin/sh
|
||||
daemon:*:1:1:daemon:/usr/sbin:/bin/sh
|
||||
bin:*:2:2:bin:/bin:/bin/sh
|
||||
sys:*:3:3:sys:/dev:/bin/sh
|
||||
@@ -0,0 +1,23 @@
|
||||
From c5f012750f8102ff54af73ccc2d2b7bfa1f26db4 Mon Sep 17 00:00:00 2001
|
||||
From: Darren Hart <dvhart@linux.intel.com>
|
||||
Date: Fri, 29 Apr 2022 13:32:28 +0000
|
||||
Subject: [PATCH] Add an input group for the /dev/input/* devices
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
|
||||
---
|
||||
group.master | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/group.master b/group.master
|
||||
index 1b5e2fb..cea9d60 100644
|
||||
--- a/group.master
|
||||
+++ b/group.master
|
||||
@@ -12,6 +12,7 @@ uucp:*:10:
|
||||
man:*:12:
|
||||
proxy:*:13:
|
||||
kmem:*:15:
|
||||
+input:*:19:
|
||||
dialout:*:20:
|
||||
fax:*:21:
|
||||
voice:*:22:
|
||||
@@ -1,4 +1,4 @@
|
||||
From 6355278b9f744291864c373a32a8da8f84aaaf37 Mon Sep 17 00:00:00 2001
|
||||
From 6cf19461fb31d7a7a3010629aae9aab49c26a01b Mon Sep 17 00:00:00 2001
|
||||
From: Jacob Kroon <jacob.kroon@gmail.com>
|
||||
Date: Wed, 30 Jan 2019 04:53:48 +0000
|
||||
Subject: [PATCH] Add kvm group
|
||||
@@ -1,4 +1,4 @@
|
||||
From 91e0db96741359173ddf2be083aafcc1a3c32472 Mon Sep 17 00:00:00 2001
|
||||
From f35eb24213475d3024ad45297fd855c6abfbbac0 Mon Sep 17 00:00:00 2001
|
||||
From: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
|
||||
Date: Mon, 18 Apr 2022 11:22:43 +0800
|
||||
Subject: [PATCH] Disable shell for default users
|
||||
@@ -52,6 +52,3 @@ index e1c32ff..0cd5ffd 100644
|
||||
+irc:*:39:39:ircd:/var/run/ircd:/sbin/nologin
|
||||
+gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/sbin/nologin
|
||||
+nobody:*:65534:65534:nobody:/nonexistent:/sbin/nologin
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 7ccf8227cb10d78f1958a7a7feed75a390a6b133 Mon Sep 17 00:00:00 2001
|
||||
From: Saul Wold <sgw@linux.intel.com>
|
||||
Date: Fri, 29 Apr 2022 13:32:28 +0000
|
||||
Subject: [PATCH] Disable generation of the documentation
|
||||
|
||||
It uses tools currently not supported by OE-Core. It uses sgmltools
|
||||
and po4a.
|
||||
|
||||
Upstream-Status: Inappropriate [OE-Core specific]
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
---
|
||||
Makefile.in | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 9ba097c..d3ea47c 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -25,13 +25,10 @@ gen_configure = config.cache config.status config.log \
|
||||
confdefhs.h config.h Makefile
|
||||
|
||||
all: update-passwd
|
||||
- $(MAKE) -C doc all
|
||||
- $(MAKE) -C man all
|
||||
|
||||
install: all
|
||||
mkdir -p $(DESTDIR)$(sbindir)
|
||||
$(INSTALL) update-passwd $(DESTDIR)$(sbindir)/
|
||||
- $(MAKE) -C man install
|
||||
|
||||
update-passwd.o: version.h
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
|
||||
We need to have a shutdown group to allow the shutdown icon
|
||||
to work correctly. Any users that want to use shutdown like
|
||||
the xuser should be added to this group.
|
||||
|
||||
Upstream-Status: Inappropriate [Embedded]
|
||||
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
Index: base-passwd-3.5.26/group.master
|
||||
===================================================================
|
||||
--- base-passwd-3.5.26.orig/group.master
|
||||
+++ base-passwd-3.5.26/group.master
|
||||
@@ -36,5 +36,6 @@ sasl:*:45:
|
||||
plugdev:*:46:
|
||||
staff:*:50:
|
||||
games:*:60:
|
||||
+shutdown:*:70:
|
||||
users:*:100:
|
||||
nogroup:*:65534:
|
||||
@@ -1,24 +0,0 @@
|
||||
Disable documentation for now as it uses tools currently not supported
|
||||
by OE-Core. It uses sgmltools and po4a.
|
||||
|
||||
Upstream-Status: Inappropriate [OE-Core specific]
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
|
||||
Index: base-passwd-3.5.28/Makefile.in
|
||||
===================================================================
|
||||
--- base-passwd-3.5.28.orig/Makefile.in
|
||||
+++ base-passwd-3.5.28/Makefile.in
|
||||
@@ -25,13 +25,10 @@ gen_configure = config.cache config.stat
|
||||
confdefhs.h config.h Makefile
|
||||
|
||||
all: update-passwd
|
||||
- $(MAKE) -C doc all
|
||||
- $(MAKE) -C man all
|
||||
|
||||
install: all
|
||||
mkdir -p $(DESTDIR)$(sbindir)
|
||||
$(INSTALL) update-passwd $(DESTDIR)$(sbindir)/
|
||||
- $(MAKE) -C man install
|
||||
|
||||
update-passwd.o: version.h
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
Add an input group for the /dev/input/* devices.
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
|
||||
|
||||
---
|
||||
group.master | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Index: base-passwd-3.5.26/group.master
|
||||
===================================================================
|
||||
--- base-passwd-3.5.26.orig/group.master
|
||||
+++ base-passwd-3.5.26/group.master
|
||||
@@ -12,6 +12,7 @@ uucp:*:10:
|
||||
man:*:12:
|
||||
proxy:*:13:
|
||||
kmem:*:15:
|
||||
+input:*:19:
|
||||
dialout:*:20:
|
||||
fax:*:21:
|
||||
voice:*:22:
|
||||
@@ -1,15 +0,0 @@
|
||||
use /bin/sh instead of /bin/bash, since the latter may not be included in
|
||||
some images such as minimal
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
||||
|
||||
--- base-passwd/passwd.master~nobash
|
||||
+++ base-passwd/passwd.master
|
||||
@@ -1,4 +1,4 @@
|
||||
-root:*:0:0:root:/root:/bin/bash
|
||||
+root:*:0:0:root:/root:/bin/sh
|
||||
daemon:*:1:1:daemon:/usr/sbin:/bin/sh
|
||||
bin:*:2:2:bin:/bin:/bin/sh
|
||||
sys:*:3:3:sys:/dev:/bin/sh
|
||||
@@ -1,14 +0,0 @@
|
||||
remove "*" for root since we don't have a /etc/shadow so far.
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
||||
|
||||
--- base-passwd/passwd.master~nobash
|
||||
+++ base-passwd/passwd.master
|
||||
@@ -1,4 +1,4 @@
|
||||
-root:*:0:0:root:/root:/bin/sh
|
||||
+root::0:0:root:/root:/bin/sh
|
||||
daemon:*:1:1:daemon:/usr/sbin:/bin/sh
|
||||
bin:*:2:2:bin:/bin:/bin/sh
|
||||
sys:*:3:3:sys:/dev:/bin/sh
|
||||
@@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
|
||||
RECIPE_NO_UPDATE_REASON = "Version 3.5.38 requires cdebconf for update-passwd utility"
|
||||
|
||||
SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar.gz \
|
||||
file://add_shutdown.patch \
|
||||
file://nobash.patch \
|
||||
file://noshadow.patch \
|
||||
file://input.patch \
|
||||
file://disable-docs.patch \
|
||||
file://kvm.patch \
|
||||
file://disable-shell.patch \
|
||||
file://0001-Add-a-shutdown-group.patch \
|
||||
file://0002-Use-bin-sh-instead-of-bin-bash-for-the-root-user.patch \
|
||||
file://0003-Remove-for-root-since-we-do-not-have-an-etc-shadow.patch \
|
||||
file://0004-Add-an-input-group-for-the-dev-input-devices.patch \
|
||||
file://0005-Add-kvm-group.patch \
|
||||
file://0006-Disable-shell-for-default-users.patch \
|
||||
file://0007-Disable-generation-of-the-documentation.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "6beccac48083fe8ae5048acd062e5421"
|
||||
|
||||
Reference in New Issue
Block a user