Merge tag '9.78' into distro/mga

Tag as 9.78

1 files changed, 18 insertions, 39 deletions

diff --git a/Makefile b/Makefile
index acdc84ec..f03dbc48 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,9 @@
-ROOT=/
+ROOT=
 SUPERUSER=root
 SUPERGROUP=root
 
 VERSION := $(shell awk '/Version:/ { print $$2 }' initscripts.spec)
-RELEASE := $(shell awk '/Release:/ { print $$2 }' initscripts.spec | sed 's|%{?dist}||g')
-TAG=initscripts-$(VERSION)-$(RELEASE)
+TAG=$(VERSION)
 
 mandir=/usr/share/man
 
@@ -22,20 +21,9 @@ install:
 	install -m644  adjtime $(ROOT)/etc
 	install -m644  rwtab statetab networks $(ROOT)/etc
 	install -m755  service $(ROOT)/usr/sbin
-	install -m644  lang.csh $(ROOT)/etc/profile.d/10lang.csh
-	install -m644  lang.sh $(ROOT)/etc/profile.d/10lang.sh
-	install -m644  256term.csh $(ROOT)/etc/profile.d/10term256.csh
-	install -m644  256term.sh $(ROOT)/etc/profile.d/10term256.sh
-	install -m644  debug.csh debug.sh $(ROOT)/etc/profile.d
+	install -m644  lang.csh lang.sh $(ROOT)/etc/profile.d
 	install -m755  sys-unconfig $(ROOT)/usr/sbin
 	install -m644  service.8 sys-unconfig.8 $(ROOT)$(mandir)/man8
-	mkdir -p -m 755 $(ROOT)/usr/lib/sysctl.d
-	mkdir -p -m 755 $(ROOT)/etc/sysctl.d
-	install -m644 sysctl.conf $(ROOT)/usr/lib/sysctl.d/00-system.conf
-	if uname -m | grep -q sparc ; then \
-	  install -m644 sysctl.conf.sparc $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi
-	if uname -m | grep -q s390 ; then \
-	  install -m644 sysctl.conf.s390 $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi
 
 	mkdir -p $(ROOT)/etc/X11
 	install -m755 prefdm $(ROOT)/etc/X11/prefdm
@@ -44,7 +32,7 @@ install:
 
 	install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig
 	cp -af rc.d/init.d $(ROOT)/etc/rc.d/
-	install -m644 sysconfig/debug sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
+	install -m644 sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
 	cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/
 	cp -af NetworkManager $(ROOT)/etc
 	# (cg) Are the two lines below needed these days???
@@ -63,9 +51,6 @@ install:
 	chmod 755 $(ROOT)/etc/NetworkManager/dispatcher.d/00-netreport
 	mkdir -p $(ROOT)/etc/sysconfig/modules
 	mkdir -p $(ROOT)/etc/sysconfig/console
-	if uname -m | grep -q s390 ; then \
-	  install -m644 sysconfig/init.s390 $(ROOT)/etc/sysconfig/init ; \
-	fi
 
 	mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/usr/sbin
 	mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/usr/sbin
@@ -75,9 +60,9 @@ install:
 	make install ROOT=$(ROOT) mandir=$(mandir) -C src
 	make install PREFIX=$(ROOT) -C po
 
-	mkdir -p $(ROOT)/var/run/netreport $(ROOT)/var/log
-	chown $(SUPERUSER):$(SUPERGROUP) $(ROOT)/var/run/netreport
-	chmod u=rwx,g=rwx,o=rx $(ROOT)/var/run/netreport
+	mkdir -p $(ROOT)/run/netreport $(ROOT)/var/log
+	chown $(SUPERUSER):$(SUPERGROUP) $(ROOT)/run/netreport
+	chmod u=rwx,g=rwx,o=rx $(ROOT)/run/netreport
 
 	for i in 0 1 2 3 4 5 6 ; do \
 		dir=$(ROOT)/etc/rc.d/rc$$i.d; \
@@ -93,19 +78,6 @@ install:
 	done	
 
 # Can't store symlinks in a CVS archive
-	mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/multi-user.target.wants
-	mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/graphical.target.wants
-	mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
-	mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/basic.target.wants
-	mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/sysinit.target.wants
-	ln -s ../fedora-loadmodules.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
-	ln -s ../fedora-autorelabel.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
-	ln -s ../fedora-autorelabel-mark.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
-	ln -s ../fedora-readonly.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
-	ln -s ../fedora-import-state.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
-	ln -s ../mandriva-save-dmesg.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
-	ln -s ../mandriva-everytime.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
-
 	mkdir -p $(ROOT)/usr/lib/tmpfiles.d
 	install -m 644 initscripts.tmpfiles.d $(ROOT)/usr/lib/tmpfiles.d/initscripts.conf
 	install -m 644 mandriva.tmpfiles.d $(ROOT)/usr/lib/tmpfiles.d/mandriva.conf
@@ -140,7 +112,14 @@ clean:
 	@find . -name "*~" -exec rm -v -f {} \;
 
 tag:
-	@make -C mandriva cvstag
-
-archive: clean syntax-check tag changelog
-	@make -C mandriva source
+	@git tag -a -f -m "Tag as $(TAG)" $(TAG)
+	@echo "Tagged as $(TAG)"
+
+archive: clean changelog
+	@git archive --format=tar --prefix=initscripts-$(VERSION)/ HEAD > initscripts-$(VERSION).tar
+	@mkdir -p initscripts-$(VERSION)/
+	@cp ChangeLog initscripts-$(VERSION)/
+	@tar --append -f initscripts-$(VERSION).tar initscripts-$(VERSION)
+	@gzip -f initscripts-$(VERSION).tar
+	@rm -rf initscripts-$(VERSION)
+	@echo "The archive is at initscripts-$(VERSION).tar.gz"