konevsa/branding-alt-virtualization-one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Package /etc/altlinux-release again

Browse Source 
Don't preserve previously installed /etc/altlinux-release:
we are keep BUILD_ID in /etc/os-release now, it is enough.
This commit is contained in:
Mikhail Efremov 2021-09-29 17:01:46 +03:00 committed by Alexey Shabalin
parent bf1bc17f2e
commit 4efd7c2b81
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@ -150,16 +150,10 @@ install: browser-qt ahttpd boot-images boot-splash boot indexhtml
#release #release
mkdir -p $(sysconfdir)/buildreqs/packages/ignore.d/ mkdir -p $(sysconfdir)/buildreqs/packages/ignore.d/
install -pD -m644 /dev/null $(sysconfdir)/buildreqs/packages/ignore.d/$(BRAND)-$(THEME)-release install -pD -m644 /dev/null $(sysconfdir)/buildreqs/packages/ignore.d/$(BRAND)-$(THEME)-release
install -d $(datadir)/branding-data-current
install -pD -m644 systemd/os-release $(prefix)/lib/os-release install -pD -m644 systemd/os-release $(prefix)/lib/os-release
echo "$(PRODUCT_NAME) ($(CODENAME))" >$(datadir)/branding-data-current/release/altlinux-release echo "$(PRODUCT_NAME) ($(CODENAME))" >$(sysconfdir)/altlinux-release
for n in fedora redhat system; do \ for n in fedora redhat system; do \
ln -s altlinux-release $(sysconfdir)/$$n-release; \ ln -s altlinux-release $(sysconfdir)/$$n-release; \
ln -s altlinux-release $(datadir)/branding-data-current/release/$$n-release; \
done
for r in $(datadir)/branding-data-current/release/*-release; do \
f="$${r##*/}"; \
touch $(sysconfdir)/"$$f"; \
done done
#notes #notes
cd notes; \ cd notes; \

9
branding.spec
View File

@ -258,12 +258,6 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/themes/%theme/grub.jpg|" \ subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/themes/%theme/grub.jpg|" \
/etc/sysconfig/grub2 ||: /etc/sysconfig/grub2 ||:
#release
%post release
if ! [ -e %_sysconfdir/altlinux-release ] && \
cp -a %data_cur_dir/release/*-release %_sysconfdir/
fi
#notes #notes
%post notes %post notes
if ! [ -e %_datadir/alt-notes/license.all.html ]; then if ! [ -e %_datadir/alt-notes/license.all.html ]; then
@ -285,9 +279,8 @@ fi
%_pixmapsdir/system-logo.png %_pixmapsdir/system-logo.png
%files release %files release
%_sysconfdir/*-release
%_prefix/lib/os-release %_prefix/lib/os-release
%dir %data_cur_dir
%data_cur_dir/release/
%_sysconfdir/buildreqs/packages/ignore.d/* %_sysconfdir/buildreqs/packages/ignore.d/*
%ghost %config(noreplace) %_sysconfdir/*-release %ghost %config(noreplace) %_sysconfdir/*-release