[gentoo-dev] [PATCH] targets: Drop /etc/asound.state creation
alsa creates this file at runtime at /var/lib/alsa/asound.state in
modern times.
Signed-off-by: Matt Turner
---
targets/support/livecdfs-update.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/targets/support/livecdfs-update.sh
b/targets/support/livecdfs-update.sh
index e750e785..251a6887 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -125,9 +125,6 @@ then
http://www.linux-usb.org/usb.ids
fi
-# touch /etc/asound.state
-touch /etc/asound.state
-
# Tweak the MOTD for Gentoo releases
case ${clst_livecd_type} in
gentoo-release-universal)
--
2.37.4
[gentoo-dev] [PATCH 5/5] catalyst: Drop livecd/{xinitrc,xsession,xdm}
This is functionality better implemented in fsscripts outside of catalyst. Signed-off-by: Matt Turner --- catalyst/targets/livecd_stage2.py| 3 -- doc/catalyst-spec.5.txt | 20 - examples/livecd-stage2_template.spec | 24 --- examples/stage4_template.spec| 10 - livecd/files/livecd.motd.txt | 3 -- targets/livecd-stage2/controller.sh | 9 targets/stage4/controller.sh | 8 targets/support/livecdfs-update.sh | 63 +--- 8 files changed, 1 insertion(+), 139 deletions(-) diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index 832e0998..1a798a1e 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -39,9 +39,6 @@ class livecd_stage2(StageBase): "livecd/users", "livecd/verify", "livecd/volid", -"livecd/xdm", -"livecd/xinitrc", -"livecd/xsession", "repos", ]) diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt index f6251597..1abf9efb 100644 --- a/doc/catalyst-spec.5.txt +++ b/doc/catalyst-spec.5.txt @@ -395,26 +395,6 @@ This is typically used for adding the documentation, distfiles, snapshots, and stages to the official media. These files will not be available if `docache` is enabled, as they are outside the loop. -*/xinitrc*:: -This is used by catalyst to copy the specified file to -`/etc/X11/xinit/xinitrc` and is used by the */type* -`generic-livecd`. While the file will still be copied for any -*/type*, catalyst will only create the necessary `/etc/startx` -for those types, so X will not be automatically started. This is -useful also for setting up X on a CD where you do not wish X to start -automatically. We do not use this on the release media. This setting -is supported by the `stage4` and `livecd` targets. - -*livecd/xdm*:: -This is used by catalyst to determine which display manager you wish -to become the default (example: `gdm`). This is used on the official -Gentoo LiveCD and is valid for any `livecd/type`. - -*livecd/xsession*:: -This is used by catalyst to determine which X session should be -started by default by the display manager (example: `gnome`). This is -used on the official Gentoo LiveCD and is valid for any livecd/type. - */users*:: This option is used to create non-root users on your target. It takes a space separated list of user names. These users will be added to diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec index 8e179b73..efbc6d82 100644 --- a/examples/livecd-stage2_template.spec +++ b/examples/livecd-stage2_template.spec @@ -202,30 +202,6 @@ livecd/overlay: # livecd/root_overlay: livecd/root_overlay: -# This is used by catalyst to copy the specified file to /etc/X11/xinit/xinitrc -# and is used by the livecd/type and generic-livecd. While the file will still -# be copied for any livecd/type, catalyst will only create the necessary -# /etc/startx for those types, so X will not be automatically started. This is -# useful also for setting up X on a CD where you do not wish X to start -# automatically. We do not use this on the release media, so it is left blank. -# example: -# livecd/xinitrc: -livecd/xinitrc: - -# This is used by catalyst to determine which display manager you wish to -# become the default. This is used on the official Gentoo LiveCD and is valid -# for any livecd/type. -# example: -# livecd/xdm: gdm -livecd/xdm: - -# This is used by catalyst to determine which X session should be started by -# default by the display manager. This is used on the official Gentoo LiveCD -# and is valid for any livecd/type. -# example: -# livecd/xsession: gnome -livecd/xsession: - # This option is used to create non-root users on your CD. It takes a space # separated list of user names. These users will be added to the following # groups: users,wheel,audio,games,cdrom,usb diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec index 5d9a390c..a7a3e766 100644 --- a/examples/stage4_template.spec +++ b/examples/stage4_template.spec @@ -161,16 +161,6 @@ stage4/rcdel: # stage4/root_overlay: stage4/root_overlay: -# This is used by catalyst to copy the specified file to /etc/X11/xinit/xinitrc -# and is used by the stage4/type generic-livecd. While the file will still be -# copied for any stage4/type, catalyst will only create the necessary -# /etc/startx for those types, so X will not be automatically started. This is -# useful also for setting up X on a CD where you do not wish X to start -# automatically. We do not use this on the release media, so it is left blank. -# example: -# stage4/xinitrc: -stage4/xinitrc: - # This option is used to create groups. It takes a carriage-return separated # list of group names. For instance: # stage4/groups: diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt index 9f8e2396..a37f53cb
[gentoo-dev] [PATCH 4/5] targets: Remove openglify usage
This script was removed from livecd-tools in commit 8e2a9c0 ("remove
openglify") in 2011.
Signed-off-by: Matt Turner
---
targets/support/livecdfs-update.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/targets/support/livecdfs-update.sh
b/targets/support/livecdfs-update.sh
index b7548347..64a9e4b2 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -131,9 +131,6 @@ then
http://www.linux-usb.org/usb.ids
fi
-# Setup opengl in /etc (if configured)
-[ -x /usr/sbin/openglify ] && /usr/sbin/openglify
-
# Setup configured display manager
if [ -n "${clst_livecd_xdm}" ]
then
--
2.37.4
[gentoo-dev] [PATCH 3/5] targets: Remove gconf usage
Bug: https://bugs.gentoo.org/873841
Signed-off-by: Matt Turner
---
livecd/files/livecd-local.start| 5 -
targets/support/livecdfs-update.sh | 24
2 files changed, 29 deletions(-)
diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start
index 3615569c..a7bb2bef 100644
--- a/livecd/files/livecd-local.start
+++ b/livecd/files/livecd-local.start
@@ -4,11 +4,6 @@
# This is a good place to load any misc.
# programs on startup ( 1>&2 )
-#if [ -d /usr/livecd/gconf ]
-#then
-# ln -sf /usr/livecd/gconf /etc/gconf
-#fi
-
#if [ -d /usr/livecd/db ]
#then
# ln -sf /usr/livecd/db /var/db
diff --git a/targets/support/livecdfs-update.sh
b/targets/support/livecdfs-update.sh
index cf2cf62f..b7548347 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -178,19 +178,6 @@ rm -f /etc/generic.motd.txt /etc/universal.motd.txt
/etc/minimal.motd.txt /etc/l
# Post configuration
case ${clst_livecd_type} in
gentoo-release-live*)
- # Setup Gnome theme
- if [ "${clst_livecd_xsession}" == "gnome" ]
- then
- gconftool-2 --direct \
- --config-source
xml:readwrite:/etc/gconf/gconf.xml.defaults \
- --type string --set
/desktop/gnome/interface/font_name "Sans 9"
- fi
-
- # Remove locking on screensaver
- gconftool-2 --direct \
-
--config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s \
- -t bool /apps/gnome-screensaver/lock_enabled false
>/dev/null
-
# Setup GDM
if [ "${clst_livecd_xdm}" == "gdm" ]
then
@@ -232,8 +219,6 @@ case ${clst_livecd_type} in
mkdir -p /usr/livecd
cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass}
/usr/livecd
rm -rf
/usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
- mv -f /etc/gconf /usr/livecd
- ln -sf /usr/livecd/gconf /etc/gconf
mv -f /var/db /usr/livecd
ln -sf /usr/livecd/db /var/db
@@ -274,15 +259,6 @@ case ${clst_livecd_type} in
fi
;;
generic-livecd )
- # This is my hack to reduce tmpfs usage
- mkdir -p /usr/livecd
-
- if [ -d /etc/gconf ]
- then
- mv -f /etc/gconf /usr/livecd
- ln -sf /usr/livecd/gconf /etc/gconf
- fi
-
touch /etc/startx
;;
esac
--
2.37.4
[gentoo-dev] [PATCH 2/5] targets: Remove remnants of support for the installer
Signed-off-by: Matt Turner
---
livecd/files/livecd.motd.txt | 2 --
targets/support/livecdfs-update.sh | 16 +---
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt
index fe4c0918..9f8e2396 100644
--- a/livecd/files/livecd.motd.txt
+++ b/livecd/files/livecd.motd.txt
@@ -1,8 +1,6 @@
To (re)start X Windows, please type "##DISPLAY_MANAGER" at the prompt below.
There is also a rescue session for X using twm if you simply use "startx".
-You can start the installer by typing "installer" at the prompt below.
-
Please report any bugs you find to https://bugs.gentoo.org. Be sure to include
detailed information about how to reproduce the bug you are reporting.
diff --git a/targets/support/livecdfs-update.sh
b/targets/support/livecdfs-update.sh
index 3f47012b..cf2cf62f 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -228,12 +228,8 @@ case ${clst_livecd_type} in
fi
fi
- # This gives us our list of system packages for the installer
- mkdir -p /usr/livecd
- ### XXX: Andrew says we don't need this anymore
- USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp
@system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' >
/usr/livecd/systempkgs.txt
-
# This is my hack to reduce tmpfs usage
+ mkdir -p /usr/livecd
cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass}
/usr/livecd
rm -rf
/usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
mv -f /etc/gconf /usr/livecd
@@ -273,16 +269,6 @@ case ${clst_livecd_type} in
[ -e
/usr/share/applications/gentoo-handbook.desktop ] && \
cp -f
/usr/share/applications/gentoo-handbook.desktop \
/home/${username}/Desktop
- # Copy our installer icons
- if [ -e
/usr/share/applications/installer-gtk.desktop ]
- then
- cp -f
/usr/share/applications/installer-{gtk,dialog}.desktop /home/${username}/Desktop
- sed -i -e \
-
's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
-
/home/${username}/Desktop/installer-dialog.desktop
- sed -i -e
's:Exec=installer-gtk:Exec=installer:' \
-
/home/${username}/Desktop/installer-gtk.desktop
- fi
chown -R ${username}:100 /home/${username}
done
fi
--
2.37.4
[gentoo-dev] [PATCH 1/5] targets: Fix enabling PermitRootLogin
The default changed to "prohibit-password" many moons ago, so our ISOs would not have allowed root logins if not for net-misc/openssh's IUSE=livecd, which handles this in the ebuild. Let's go ahead and fix it, so that we can consider removing openssh's livecd USE flag which would allow us to avoid rebuilding the package for the ISO. Signed-off-by: Matt Turner --- targets/support/livecdfs-update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index b7ead552..3f47012b 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -7,7 +7,8 @@ source /tmp/chroot-functions.sh # Allow root logins to our CD by default if [ -e /etc/ssh/sshd_config ] then - sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \ + sed -i \ + -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ /etc/ssh/sshd_config fi -- 2.37.4
Re: [gentoo-dev] Last rites: net-mail/vchkuser
John Helmert III wrote: > > Searching for the repo name on GitHub finds this however: > > > > https://github.com/bdrewery/vchkuser > > > > ..which seems to be a 2010 version of the code. I did a test, it works > > fine. Maybe just change the SRC_URI. > > Can you produce a guarantee that the code there is equal to the code > which the ebuild currently refers to? Or maybe that it's equivalent to > the now-removed repository? Git thinks so. I unpacked vchkuser-0.4.tar.gz from a Gentoo mirror on top of a bdrewery/vchkuser checkout and: $ git status # On branch master nothing to commit, working directory clean $ The v0.4 tag in bdrewery/vchkuser also equals the commit hash in the directory name of the .tar.gz. (This is of course weak.) //Peter
Re: [gentoo-dev] Last rites: net-mail/vchkuser
On Mon, Nov 14, 2022 at 09:53:43PM +, Peter Stuge wrote: > John Helmert III wrote: > > > Jonas Stein wrote: > > > > # Dead upstream > > > > # Removal after 2023-01-01. Bug #881249. > > > > net-mail/vchkuser > > > > > > Was there an actual issue with the package that prompted you to do > > > this - something that a package maintainer should have resolved? > > > > > > I think it's a bad idea to remove a package if "Upstream Homepage and > > > SRC_URI is gone" and "Gentoo is the last distro with this package" > > > are the only reasons... > > > > Do you use it? Is it still functional? > > I don't use it, I use something else for the same task. > > Looking up the GitHub user that person seems present, just that > particular repo is no longer there. > > Searching for the repo name on GitHub finds this however: > > https://github.com/bdrewery/vchkuser > > ..which seems to be a 2010 version of the code. I did a test, it works > fine. Maybe just change the SRC_URI. Can you produce a guarantee that the code there is equal to the code which the ebuild currently refers to? Or maybe that it's equivalent to the now-removed repository? > > //Peter > signature.asc Description: PGP signature
Re: [gentoo-dev] Last rites: net-mail/vchkuser
John Helmert III wrote: > > Jonas Stein wrote: > > > # Dead upstream > > > # Removal after 2023-01-01. Bug #881249. > > > net-mail/vchkuser > > > > Was there an actual issue with the package that prompted you to do > > this - something that a package maintainer should have resolved? > > > > I think it's a bad idea to remove a package if "Upstream Homepage and > > SRC_URI is gone" and "Gentoo is the last distro with this package" > > are the only reasons... > > Do you use it? Is it still functional? I don't use it, I use something else for the same task. Looking up the GitHub user that person seems present, just that particular repo is no longer there. Searching for the repo name on GitHub finds this however: https://github.com/bdrewery/vchkuser ..which seems to be a 2010 version of the code. I did a test, it works fine. Maybe just change the SRC_URI. //Peter
Re: [gentoo-dev] Last rites: net-mail/vchkuser
Hi Peter, # Removal after 2023-01-01. Bug #881249. net-mail/vchkuser Was there an actual issue with the package that prompted you to do this - something that a package maintainer should have resolved? Complete list is in the ticket. I set the delay a bit longer than 30 days so that users have more time to react. If you or others really need this package, report here or in the ticket and we can find a solution. We do not want to break our users system, if we can find another solution including reinstating an upstream repository. But we also do not want to invest time in a dead horse. I think it's a bad idea to remove a package if "Upstream Homepage and SRC_URI is gone" and "Gentoo is the last distro with this package" are the only reasons... A project should always have a real upstream source and not rely on remains in our mirrors. -- Best, Jonas
[gentoo-dev] Last Rites: x11-misc/xnee
# Matt Turner (2022-11-14) # Unmaintained in Gentoo since at least the transition to git. Last release in # 2014. Depends on x11-libs/gtk+:2 and gnome-base/gconf. Fails to build with # (1) clang-16, (2) with LTO, (3) with -fno-common. # Bugs #812137, #864763, #871405, #873886 # Removal on 2022-12-14 x11-misc/xnee signature.asc Description: PGP signature
Re: [gentoo-dev] Last rites: net-mail/vchkuser
On Mon, Nov 14, 2022 at 04:43:51PM +, Peter Stuge wrote: > Jonas Stein wrote: > > # Dead upstream > > # Removal after 2023-01-01. Bug #881249. > > net-mail/vchkuser > > Was there an actual issue with the package that prompted you to do > this - something that a package maintainer should have resolved? > > I think it's a bad idea to remove a package if "Upstream Homepage and > SRC_URI is gone" and "Gentoo is the last distro with this package" > are the only reasons... Do you use it? Is it still functional? > > Thanks > > //Peter > signature.asc Description: PGP signature
Re: [gentoo-dev] Last rites: net-mail/vchkuser
Jonas Stein wrote: > # Dead upstream > # Removal after 2023-01-01. Bug #881249. > net-mail/vchkuser Was there an actual issue with the package that prompted you to do this - something that a package maintainer should have resolved? I think it's a bad idea to remove a package if "Upstream Homepage and SRC_URI is gone" and "Gentoo is the last distro with this package" are the only reasons... Thanks //Peter
