6 replies to this topic

[mrk72]

I tried to build openPLi from scratch an ran into some missing files.

At present the package base-passwd tries to download the version 3.5.20, which is no longer available from debian server.
We have to update to version 3.5.24.

This patch will do this.

greetz
mrk

recipes/base-passwd/base-passwd-3.5.24/mysql.patch |	8 ++
.../base-passwd-3.5.24/passwd.master.patch		 |	8 ++
recipes/base-passwd/base-passwd_3.5.20.bb		  |   71 --------------------
recipes/base-passwd/base-passwd_3.5.24.bb		  |   71 ++++++++++++++++++++
4 files changed, 87 insertions(+), 71 deletions(-)
create mode 100644 recipes/base-passwd/base-passwd-3.5.24/mysql.patch
create mode 100644 recipes/base-passwd/base-passwd-3.5.24/passwd.master.patch
delete mode 100644 recipes/base-passwd/base-passwd_3.5.20.bb
create mode 100644 recipes/base-passwd/base-passwd_3.5.24.bb
diff --git a/recipes/base-passwd/base-passwd-3.5.24/mysql.patch b/recipes/base-passwd/base-passwd-3.5.24/mysql.patch
new file mode 100644
index 0000000..b641f41
--- /dev/null
+++ b/recipes/base-passwd/base-passwd-3.5.24/mysql.patch
@@ -0,0 +1,8 @@
+--- base-passwd/group.master.orig 2005-07-08 06:36:07.717990112 +0200
++++ base-passwd/group.master 2005-07-08 06:36:32.000000000 +0200
+@@ -36,4 +36,5 @@
+ staff:*:50:
+ games:*:60:
+ users:*:100:
++mysql:*:64001:
+ nogroup:*:65534:
diff --git a/recipes/base-passwd/base-passwd-3.5.24/passwd.master.patch b/recipes/base-passwd/base-passwd-3.5.24/passwd.master.patch
new file mode 100644
index 0000000..9ef52dd
--- /dev/null
+++ b/recipes/base-passwd/base-passwd-3.5.24/passwd.master.patch
@@ -0,0 +1,8 @@
+--- base-passwd/passwd.master.orig 2009-03-17 14:23:49.000000000 +0100
++++ base-passwd/passwd.master 2012-04-18 23:42:18.882015620 +0200
+@@ -1,4 +1,4 @@
+-root:*:0:0:root:/root:/bin/bash
++root:*:0:0:root:/home/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
diff --git a/recipes/base-passwd/base-passwd_3.5.20.bb b/recipes/base-passwd/base-passwd_3.5.20.bb
deleted file mode 100644
index 6e9c51b..0000000
--- a/recipes/base-passwd/base-passwd_3.5.20.bb
+++ /dev/null
@@ -1,71 +0,0 @@
-DESCRIPTION = "Base system password/group files."
-SECTION = "base"
-LICENSE = "GPLv2"
-PR = "r1"
-
-SRC_URI = "\
-  ${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
-  file://nobash.patch \
-  file://root-home.patch \
-  file://mysql.patch \
-"
-S = "${WORKDIR}/base-passwd"
-
-inherit autotools
-
-do_install_docs () {
- install -d -m 755 \
- ${D}${mandir}/man8 ${D}${mandir}/pl/man8
- install -p -m 644 man/update-passwd.8 \
- ${D}${mandir}/man8/
- install -p -m 644 man/update-passwd.pl.8 \
- ${D}${mandir}/pl/man8/update-passwd.8
- gzip -9 ${D}${mandir}/man8/* \
- ${D}${mandir}/pl/man8/*
-
- install -d -m 755 ${D}${docdir}/${PN}
- install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
- gzip -9 ${D}${docdir}/${PN}/*
- install -p -m 644 README ${D}${docdir}/${PN}/
- install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
-}
-
-do_install () {
-		do_install_docs
-
- install -d -m 755 ${D}${sbindir}
- install -p -m 755 update-passwd ${D}${sbindir}/
- install -d -m 755 ${D}${datadir}/base-passwd
- install -p -m 644 passwd.master \
- ${D}${datadir}/base-passwd/
- install -p -m 644 group.master \
- ${D}${datadir}/base-passwd/
-}
-
-do_install_micro () {
- install -d -m 755 ${D}${sysconfdir}
- install -p -m 644 passwd.master ${D}${sysconfdir}/passwd
- install -p -m 644 group.master ${D}${sysconfdir}/group
-}
-
-do_install_append_openmn() {
- echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
-}
-
-FILES_${PN}-doc += "${docdir}"
-
-pkg_postinst () {
- set -e
-
- if [ ! -e $D${sysconfdir}/passwd ] ; then
- cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd
- fi
-
- if [ ! -e $D${sysconfdir}/group ] ; then
- cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group
- fi
- exit 0
-}
-
-SRC_URI[md5sum] = "1f93b419b35f0b0b2ae78cf3cb1ef491"
-SRC_URI[sha256sum] = "3f4f59d07af4fccdf6aed0822b25422ad7cfaee442a3ab870dc031f173d456f2"

diff --git a/recipes/base-passwd/base-passwd_3.5.24.bb b/recipes/base-passwd/base-passwd_3.5.24.bb
new file mode 100644
index 0000000..4242247
--- /dev/null
+++ b/recipes/base-passwd/base-passwd_3.5.24.bb
@@ -0,0 +1,71 @@
+DESCRIPTION = "Base system password/group files."
+SECTION = "base"
+LICENSE = "GPLv2"
+PR = "r1"
+
+SRC_URI = "\
+  ${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
+  file://passwd.master.patch \
+  file://mysql.patch \
+"
+SRC_URI[md5sum] = "8f6b9420c50e90edaff41eb2fb7e9e16"
+SRC_URI[sha256sum] = "196083d6f675190d4e2cede0a5fa6b3c91088705c5386f76292fec8e74b6369e"
+
+S = "${WORKDIR}/base-passwd"
+
+inherit autotools
+
+do_install_docs () {
+ install -d -m 755 \
+ ${D}${mandir}/man8 ${D}${mandir}/pl/man8
+ install -p -m 644 man/update-passwd.8 \
+ ${D}${mandir}/man8/
+ install -p -m 644 man/update-passwd.pl.8 \
+ ${D}${mandir}/pl/man8/update-passwd.8
+ gzip -9 ${D}${mandir}/man8/* \
+ ${D}${mandir}/pl/man8/*
+
+ install -d -m 755 ${D}${docdir}/${PN}
+ install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
+ gzip -9 ${D}${docdir}/${PN}/*
+ install -p -m 644 README ${D}${docdir}/${PN}/
+ install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
+}
+
+do_install () {
+		do_install_docs
+
+ install -d -m 755 ${D}${sbindir}
+ install -p -m 755 update-passwd ${D}${sbindir}/
+ install -d -m 755 ${D}${datadir}/base-passwd
+ install -p -m 644 passwd.master \
+ ${D}${datadir}/base-passwd/
+ install -p -m 644 group.master \
+ ${D}${datadir}/base-passwd/
+}
+
+do_install_micro () {
+ install -d -m 755 ${D}${sysconfdir}
+ install -p -m 644 passwd.master ${D}${sysconfdir}/passwd
+ install -p -m 644 group.master ${D}${sysconfdir}/group
+}
+
+do_install_append_openmn() {
+ echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
+}
+
+FILES_${PN}-doc += "${docdir}"
+
+pkg_postinst () {
+ set -e
+
+ if [ ! -e $D${sysconfdir}/passwd ] ; then
+ cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd
+ fi
+
+ if [ ! -e $D${sysconfdir}/group ] ; then
+ cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group
+ fi
+ exit 0
+}
+

[pieterg]

could you attach the patch? The code block breaks it.

[mrk72]

Here You are.
I tried to attach the first time, too, but it told me, I am not permitted to upload this kind of file.

Now I found out, that renaming the file might be a solution.
Hope that helps.

Attached Files

•  0001-update-base-passwd-to-3.5.24.patch.txt   6.04KB   19 downloads

[Erik Slagter]

It this a very recent development? I rebuilt a complete environment only last week without problem. But I still had the sources, probably.

[mrk72]

Hi Erik, yes it is a recent work.
From time to time I clone a complete new environment and do not use the old sources.
This shows some/many "do_fetch" errors.

This post corrects other issues, too. #7

[Erik Slagter]

Hmmm, bummer.

[mrk72]

Thank You for applying the patches.