Add the mdkconf patch

1 files changed, 26 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index a788e0ae..9fd2ab2e 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,9 @@ install:
 	install -m644 inittab.upstart $(ROOT)/etc/inittab.upstart
 	install -m644 inittab.systemd $(ROOT)/etc/inittab.systemd
 	install -m644  rwtab statetab networks $(ROOT)/etc
-	install -m755  service setsysfont $(ROOT)/sbin
-	install -m644  lang.csh lang.sh $(ROOT)/etc/profile.d
+	install -m755  service $(ROOT)/sbin
+	install -m644  lang.csh $(ROOT)/etc/profile.d/10lang.csh
+	install -m644  lang.sh $(ROOT)/etc/profile.d/10lang.sh
 	install -m644  debug.csh debug.sh $(ROOT)/etc/profile.d
 	install -m755  sys-unconfig $(ROOT)/usr/sbin
 	install -m644  crypttab.5 $(ROOT)$(mandir)/man5
@@ -48,8 +49,11 @@ install:
 	install -m644 sysconfig/debug sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
 	cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/
 	cp -af ppp NetworkManager init $(ROOT)/etc
+	mkdir -p $(ROOT)/etc/sysconfig/console/consolefonts
+	mkdir -p $(ROOT)/etc/sysconfig/console/consoletrans
 	mkdir -p $(ROOT)/lib/systemd/
 	cp -af systemd/* $(ROOT)/lib/systemd/
+	chmod 755 $(ROOT)/lib/systemd/mandriva-*
 	mkdir -p $(ROOT)/etc/ppp/peers
 	mkdir -p $(ROOT)/lib
 	cp -af udev $(ROOT)/lib
@@ -80,8 +84,6 @@ install:
 	mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/sbin
 	mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/sbin
 	(cd $(ROOT)/etc/sysconfig/network-scripts; \
-	  ln -sf ifup-ippp ifup-isdn ; \
-	  ln -sf ifdown-ippp ifdown-isdn ; \
 	  ln -sf ../../../sbin/ifup . ; \
 	  ln -sf ../../../sbin/ifdown . )
 	make install ROOT=$(ROOT) mandir=$(mandir) -C src
@@ -99,6 +101,13 @@ install:
 	  	mkdir $$dir; \
 		chmod u=rwx,g=rx,o=rx $$dir; \
 	done
+	# install translated man pages
+	for j in 1 3 8 ; do \
+	    for i in man/??* ; do \
+		install -d $(ROOT)$(mandir)/`basename $$i`/man$$j ; \
+		install -m 644 $$i/*.$$j $(ROOT)$(mandir)/`basename $$i`/man$$j ; \
+	    done ; \
+	done	
 
 # Can't store symlinks in a CVS archive
 	ln -s ../init.d/killall $(ROOT)/etc/rc.d/rc0.d/S00killall
@@ -130,13 +139,19 @@ install:
 	ln -s ../fedora-readonly.service $(ROOT)/lib/systemd/system/local-fs.target.wants
 	ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants
 	ln -s ../fedora-sysinit-unhack.service $(ROOT)/lib/systemd/system/multi-user.target.wants
+	ln -s ../mandriva-kmsg-loglevel.service $(ROOT)/lib/systemd/system/sysinit.target.wants
+	ln -s ../mandriva-clean-var-run-lock.service $(ROOT)/lib/systemd/system/sysinit.target.wants
+	ln -s ../mandriva-boot-links.service $(ROOT)/lib/systemd/system/basic.target.wants
+	ln -s ../mandriva-save-dmesg.service $(ROOT)/lib/systemd/system/basic.target.wants
+	ln -s ../mandriva-everytime.service $(ROOT)/lib/systemd/system/basic.target.wants
 
 	mkdir -p $(ROOT)/etc/tmpfiles.d
 	install -m 644 initscripts.tmpfiles.d $(ROOT)/etc/tmpfiles.d/initscripts.conf
+	install -m 644 mandriva.tmpfiles.d $(ROOT)/etc/tmpfiles.d/mandriva.conf
 
 # These are LSB compatibility symlinks.  At some point in the future
 # the actual files will be here instead of symlinks
-	for i in 0 1 2 3 4 5 6 ; do \
+	for i in 0 1 2 3 4 5 6 S ; do \
 		ln -s rc.d/rc$$i.d $(ROOT)/etc/rc$$i.d; \
 	done
 	for i in rc rc.sysinit rc.local ; do \
@@ -144,21 +159,20 @@ install:
 	done
 
 
-
 syntax-check:
-	for afile in `find . -type f -perm +111|grep -v \.csh | grep -v .git | grep -v po/ ` ; do \
-		if ! file $$afile | grep -s ELF  >/dev/null; then \
+	for afile in `find . -type f -perm +111|grep -v \.csh | grep -v .git | grep -v po/ | grep -v 'gprintify.py' ` ; do \
+		if ! file $$afile | grep -s ELF  >/dev/null && ! file $$afile | grep -s perl >/dev/null; then \
 		    bash -n $$afile || { echo $$afile ; exit 1 ; } ; \
 		fi  ;\
 	done
+	make -C mandriva check
 
 check: syntax-check
 	make check -C src
 	make clean -C src
 
 changelog:
-	@rm -f ChangeLog
-	git log --stat > ChangeLog
+	make -C mandriva changelog
 
 clean:
 	make clean -C src
@@ -166,17 +180,7 @@ clean:
 	@rm -fv *~ changenew ChangeLog.old *gz
 
 tag:
-	@git tag -a -f -m "Tag as $(TAG)" $(TAG)
-	@echo "Tagged as $(TAG)"
+	@make -C mandriva cvstag
 
 archive: clean syntax-check tag 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)
-	@bzip2 -f initscripts-$(VERSION).tar
-	@rm -rf initscripts-$(VERSION)
-	@echo "The archive is at initscripts-$(VERSION).tar.bz2"
-	@sha1sum initscripts-$(VERSION).tar.bz2 > initscripts-$(VERSION).sha1sum
-	@scp initscripts-$(VERSION).tar.bz2 initscripts-$(VERSION).sha1sum fedorahosted.org:initscripts 2>/dev/null|| scp initscripts-$(VERSION).tar.bz2 initscripts-$(VERSION).sha1sum fedorahosted.org:/srv/web/releases/i/n/initscripts
-	@echo "Everything done, files uploaded to Fedorahosted.org"
+	@make -C mandriva source