From a1f912e4d8de292d77374d3ad28378284a954937 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Mon, 18 Dec 2023 22:47:17 +0800 Subject: base-passwd: upgrade 3.6.2 -> 3.6.3 (From OE-Core rev: 74d165f5baacd0cd94eb90396b0a3119281df91d) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-core/base-passwd/base-passwd_3.6.2.bb | 125 --------------------- meta/recipes-core/base-passwd/base-passwd_3.6.3.bb | 125 +++++++++++++++++++++ 2 files changed, 125 insertions(+), 125 deletions(-) delete mode 100644 meta/recipes-core/base-passwd/base-passwd_3.6.2.bb create mode 100644 meta/recipes-core/base-passwd/base-passwd_3.6.3.bb diff --git a/meta/recipes-core/base-passwd/base-passwd_3.6.2.bb b/meta/recipes-core/base-passwd/base-passwd_3.6.2.bb deleted file mode 100644 index bb4b49e6ab..0000000000 --- a/meta/recipes-core/base-passwd/base-passwd_3.6.2.bb +++ /dev/null @@ -1,125 +0,0 @@ -SUMMARY = "Base system master password/group files" -DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group). The update-passwd tool is also provided to keep the system databases synchronized with these master files." -HOMEPAGE = "https://launchpad.net/base-passwd" -SECTION = "base" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" - -SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar.xz \ - 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://0007-Add-wheel-group.patch \ - file://0001-base-passwd-Add-the-sgx-group.patch \ - " - -SRC_URI[sha256sum] = "06dc78352bf38a8df76ff295e15ab5654cdefe41e62368b15bfcbbab8e4ec2a0" - -# the package is taken from launchpad; that source is static and goes stale -# so we check the latest upstream from a directory that does get updated -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/" - -S = "${WORKDIR}/work" - -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" -PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux, libselinux" - -inherit autotools - -EXTRA_OECONF += "--disable-debconf --disable-docs" - -NOLOGIN ?= "${base_sbindir}/nologin" - -do_install () { - install -d -m 755 ${D}${sbindir} - install -o root -g root -p -m 755 ${B}/update-passwd ${D}${sbindir}/ - install -d -m 755 ${D}${mandir}/man8 ${D}${mandir}/pl/man8 - install -p -m 644 ${S}/man/update-passwd.8 ${D}${mandir}/man8/ - install -p -m 644 ${S}/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}${datadir}/base-passwd - install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/ - sed -i 's#:/root:#:${ROOT_HOME}:#' ${D}${datadir}/base-passwd/passwd.master - sed -i 's#/usr/sbin/nologin#${NOLOGIN}#' ${D}${datadir}/base-passwd/passwd.master - install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/ - - install -d -m 755 ${D}${docdir}/${BPN} - install -p -m 644 ${S}/debian/changelog ${D}${docdir}/${BPN}/ - gzip -9 ${D}${docdir}/${BPN}/* - install -p -m 644 ${S}/README ${D}${docdir}/${BPN}/ - install -p -m 644 ${S}/debian/copyright ${D}${docdir}/${BPN}/ -} - -basepasswd_sysroot_postinst() { -#!/bin/sh - -# Install passwd.master and group.master to sysconfdir -install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir} -for i in passwd group; do - install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/\$i.master \ - ${STAGING_DIR_TARGET}${sysconfdir}/\$i -done - -# Run any useradd postinsts -for script in ${STAGING_DIR_TARGET}${bindir}/postinst-useradd-*; do - if [ -f \$script ]; then - \$script - fi -done -} - -SYSROOT_DIRS += "${sysconfdir}" -SYSROOT_PREPROCESS_FUNCS += "base_passwd_tweaksysroot" - -base_passwd_tweaksysroot () { - mkdir -p ${SYSROOT_DESTDIR}${bindir} - dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN} - echo "${basepasswd_sysroot_postinst}" > $dest - chmod 0755 $dest -} - -python populate_packages:prepend() { - # Add in the preinst function for ${PN} - # We have to do this here as prior to this, passwd/group.master - # would be unavailable. We need to create these files at preinst - # time before the files from the package may be available, hence - # storing the data from the files in the preinst directly. - - f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') - passwd = "".join(f.readlines()) - f.close() - f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') - group = "".join(f.readlines()) - f.close() - - preinst = """#!/bin/sh -mkdir -p $D${sysconfdir} -if [ ! -e $D${sysconfdir}/passwd ]; then -\tcat << 'EOF' > $D${sysconfdir}/passwd -""" + passwd + """EOF -fi -if [ ! -e $D${sysconfdir}/group ]; then -\tcat << 'EOF' > $D${sysconfdir}/group -""" + group + """EOF -fi -""" - d.setVar(d.expand('pkg_preinst:${PN}'), preinst) -} - -addtask do_package after do_populate_sysroot - -ALLOW_EMPTY:${PN} = "1" - -PACKAGES =+ "${PN}-update" -FILES:${PN}-update = "${sbindir}/* ${datadir}/${PN}" - -pkg_postinst:${PN}-update () { -#!/bin/sh -if [ -n "$D" ]; then - exit 0 -fi -${sbindir}/update-passwd -} diff --git a/meta/recipes-core/base-passwd/base-passwd_3.6.3.bb b/meta/recipes-core/base-passwd/base-passwd_3.6.3.bb new file mode 100644 index 0000000000..9d7703b1c0 --- /dev/null +++ b/meta/recipes-core/base-passwd/base-passwd_3.6.3.bb @@ -0,0 +1,125 @@ +SUMMARY = "Base system master password/group files" +DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group). The update-passwd tool is also provided to keep the system databases synchronized with these master files." +HOMEPAGE = "https://launchpad.net/base-passwd" +SECTION = "base" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" + +SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar.xz \ + 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://0007-Add-wheel-group.patch \ + file://0001-base-passwd-Add-the-sgx-group.patch \ + " + +SRC_URI[sha256sum] = "83575327d8318a419caf2d543341215c046044073d1afec2acc0ac4d8095ff39" + +# the package is taken from launchpad; that source is static and goes stale +# so we check the latest upstream from a directory that does get updated +UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/" + +S = "${WORKDIR}/work" + +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" +PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux, libselinux" + +inherit autotools + +EXTRA_OECONF += "--disable-debconf --disable-docs" + +NOLOGIN ?= "${base_sbindir}/nologin" + +do_install () { + install -d -m 755 ${D}${sbindir} + install -o root -g root -p -m 755 ${B}/update-passwd ${D}${sbindir}/ + install -d -m 755 ${D}${mandir}/man8 ${D}${mandir}/pl/man8 + install -p -m 644 ${S}/man/update-passwd.8 ${D}${mandir}/man8/ + install -p -m 644 ${S}/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}${datadir}/base-passwd + install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/ + sed -i 's#:/root:#:${ROOT_HOME}:#' ${D}${datadir}/base-passwd/passwd.master + sed -i 's#/usr/sbin/nologin#${NOLOGIN}#' ${D}${datadir}/base-passwd/passwd.master + install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/ + + install -d -m 755 ${D}${docdir}/${BPN} + install -p -m 644 ${S}/debian/changelog ${D}${docdir}/${BPN}/ + gzip -9 ${D}${docdir}/${BPN}/* + install -p -m 644 ${S}/README ${D}${docdir}/${BPN}/ + install -p -m 644 ${S}/debian/copyright ${D}${docdir}/${BPN}/ +} + +basepasswd_sysroot_postinst() { +#!/bin/sh + +# Install passwd.master and group.master to sysconfdir +install -d -m 755 ${STAGING_DIR_TARGET}${sysconfdir} +for i in passwd group; do + install -p -m 644 ${STAGING_DIR_TARGET}${datadir}/base-passwd/\$i.master \ + ${STAGING_DIR_TARGET}${sysconfdir}/\$i +done + +# Run any useradd postinsts +for script in ${STAGING_DIR_TARGET}${bindir}/postinst-useradd-*; do + if [ -f \$script ]; then + \$script + fi +done +} + +SYSROOT_DIRS += "${sysconfdir}" +SYSROOT_PREPROCESS_FUNCS += "base_passwd_tweaksysroot" + +base_passwd_tweaksysroot () { + mkdir -p ${SYSROOT_DESTDIR}${bindir} + dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN} + echo "${basepasswd_sysroot_postinst}" > $dest + chmod 0755 $dest +} + +python populate_packages:prepend() { + # Add in the preinst function for ${PN} + # We have to do this here as prior to this, passwd/group.master + # would be unavailable. We need to create these files at preinst + # time before the files from the package may be available, hence + # storing the data from the files in the preinst directly. + + f = open(d.expand("${STAGING_DATADIR}/base-passwd/passwd.master"), 'r') + passwd = "".join(f.readlines()) + f.close() + f = open(d.expand("${STAGING_DATADIR}/base-passwd/group.master"), 'r') + group = "".join(f.readlines()) + f.close() + + preinst = """#!/bin/sh +mkdir -p $D${sysconfdir} +if [ ! -e $D${sysconfdir}/passwd ]; then +\tcat << 'EOF' > $D${sysconfdir}/passwd +""" + passwd + """EOF +fi +if [ ! -e $D${sysconfdir}/group ]; then +\tcat << 'EOF' > $D${sysconfdir}/group +""" + group + """EOF +fi +""" + d.setVar(d.expand('pkg_preinst:${PN}'), preinst) +} + +addtask do_package after do_populate_sysroot + +ALLOW_EMPTY:${PN} = "1" + +PACKAGES =+ "${PN}-update" +FILES:${PN}-update = "${sbindir}/* ${datadir}/${PN}" + +pkg_postinst:${PN}-update () { +#!/bin/sh +if [ -n "$D" ]; then + exit 0 +fi +${sbindir}/update-passwd +} -- cgit v1.2.3-54-g00ecf