summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--images/Makefile20
-rw-r--r--mdk-stage1/Makefile20
-rw-r--r--perl-install/Makefile25
-rw-r--r--perl-install/Makefile.drakxtools4
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/Makefile26
-rw-r--r--perl-install/install/help/po/.gitignore1
-rw-r--r--perl-install/install/share/po/.gitignore1
-rw-r--r--perl-install/share/po/.gitignore1
-rw-r--r--rescue/Makefile21
10 files changed, 17 insertions, 104 deletions
diff --git a/images/Makefile b/images/Makefile
index 454b46cc6..01bbc23f3 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -22,26 +22,8 @@ all.kernels: update_kernel ../kernel/list_modules.pm
dist: tar
tar:
@rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION)
- @if [ -e "../.svn" ]; then \
- $(MAKE) dist-svn; \
- elif [ -e "../.git" ]; then \
- $(MAKE) dist-git; \
- else \
- echo "Unknown SCM (not SVN nor GIT)";\
- exit 1; \
- fi;
- $(info $(PRODUCT)-$(VERSION).tar.xz is ready)
-
-dist-svn:
- mkdir -p $(PRODUCT)-$(VERSION)
- svn export -q -rBASE . $(PRODUCT)-$(VERSION)/images
- svn export -q -rBASE ../kernel $(PRODUCT)-$(VERSION)/kernel
- cp ../Makefile.config $(PRODUCT)-$(VERSION)/
- tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION)
- rm -rf $(PRODUCT)-$(VERSION)
-
-dist-git:
@cd ..; git archive --prefix=$(PRODUCT)-$(VERSION)/ HEAD images kernel Makefile.config | xz >images/$(PRODUCT)-$(VERSION).tar.xz;
+ $(info $(PRODUCT)-$(VERSION).tar.xz is ready)
clean:
rm -rf images isolinux all.kernels modules.description
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 71549021b..1dfa6d362 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -207,26 +207,8 @@ probe-modules: probe-modules.o probing-FULL.o modules-FULL.o params-FULL.o utils
dist: tar
tar:
rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION)
- @if [ -e "../.svn" ]; then \
- $(MAKE) dist-svn; \
- elif [ -e "../.git" ]; then \
- $(MAKE) dist-git; \
- else \
- echo "Unknown SCM (not SVN nor GIT)";\
- exit 1; \
- fi;
- $(info $(PRODUCT)-$(VERSION).tar.xz is ready)
-
-dist-svn:
- mkdir -p $(PRODUCT)-$(VERSION)
- svn export -q -rBASE . $(PRODUCT)-$(VERSION)/mdk-stage1
- svn export -q -rBASE ../kernel $(PRODUCT)-$(VERSION)/kernel
- cp ../Makefile.config $(PRODUCT)-$(VERSION)/
- tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION)
- rm -rf $(PRODUCT)-$(VERSION)
-
-dist-git:
@cd ..; git archive --prefix=$(PRODUCT)-$(VERSION)/ HEAD mdk-stage1 kernel Makefile.config | xz >mdk-stage1/$(PRODUCT)-$(VERSION).tar.xz;
+ $(info $(PRODUCT)-$(VERSION).tar.xz is ready)
.depend:
$(CPP) $(CFLAGS) -M $(ALLSRC) > .depend
diff --git a/perl-install/Makefile b/perl-install/Makefile
index f83ceaadb..55871dbe0 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -53,33 +53,18 @@ install_pms stage2 full_stage2:
mo_files : $(MOFILES)
# rules to build tarball
-dist-svn:
+dist: tar
+
+tar: clean
+ rm -rf $(PACKAGE)*.tar* $(PACKAGE)-$(PKGVERSION)
mkdir -p $(PACKAGE)-$(PKGVERSION)/tools
- svn export -q -rBASE . $(PACKAGE)-$(PKGVERSION)/perl-install
- for i in $(OTHERS); do svn export -q ../$$i $(PACKAGE)-$(PKGVERSION)/$$i; done
+ (cd ..; git archive HEAD perl-install/{[^i]*,int*} $(OTHERS) kernel/list_modules.pm Makefile.config) | tar xC $(PACKAGE)-$(PKGVERSION)
rm -rf $(PACKAGE)-$(PKGVERSION)/perl-install/{install,unused,list_modules.pm}
cp -f ../kernel/list_modules.pm $(PACKAGE)-$(PKGVERSION)/perl-install
cd $(PACKAGE)-$(PKGVERSION)/perl-install ; mv -f Makefile.drakxtools Makefile
@make nuke_perl
tar cfa $(PACKAGE)-$(PKGVERSION).tar.xz $(PACKAGE)-$(PKGVERSION)
rm -rf $(PACKAGE)-$(PKGVERSION)
-
-dist-git:
- @cd ..; git archive --prefix=$(PACKAGE)-$(PKGVERSION)/ HEAD perl-install/{[^i]*,int*} $(OTHERS) kernel/list_modules.pm Makefile.config | xz >$(PACKAGE)-$(PKGVERSION).tar.xz;
- @echo "WARNING: this archive is not complete !!! Regenerate it from SVN"
-
-dist: tar
-
-tar: clean
- rm -rf $(PACKAGE)*.tar* $(PACKAGE)-$(PKGVERSION)
- @if [ -e "../../.svn" ]; then \
- $(MAKE) dist-svn; \
- elif [ -e "../.git" ]; then \
- $(MAKE) dist-git; \
- else \
- echo "Unknown SCM (not SVN nor GIT)";\
- exit 1; \
- fi;
$(info $(PACKAGE)-$(PKGVERSION).tar.xz is ready)
# rules to build a distributable rpm
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index fa5ab4b51..a5a9394e2 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -34,7 +34,6 @@ install:
install -d $(INLIBDEST_DIRS:%=$(LIBDEST)/%)
install $(STANDALONEPMS) standalone/convert $(SBINDEST)
install -s ../tools/rpcinfo-flushed ../tools/serial_probe/serial_probe $(SBINDEST)
- ln -s XFdrake $(SBINDEST)/Xdrakres
ln -s fileshareset $(SBINDEST)/filesharelist
mv -f $(SBINDEST)/lsnetdrake $(BINDEST)
mv -f $(SBINDEST)/drakbug $(BINDEST)
@@ -75,14 +74,11 @@ install:
mv $(SBINDEST)/convert $(DATADIR)/harddrake
mv $(SBINDEST)/service_harddrake $(DATADIR)/harddrake/
mv $(SBINDEST)/notify-x11-free-driver-switch $(DATADIR)/harddrake/
- ln -s {XFdrake,$(SBINDEST)/drakx11}
ln -s {diskdrake,$(SBINDEST)/drakdisk}
ln -s {drakclock,$(SBINDEST)/clock.pl}
ln -s {harddrake2,$(SBINDEST)/drakhardware}
- ln -s {keyboarddrake,$(SBINDEST)/drakkeyboard}
ln -s {localedrake,$(BINDEST)/draklocale}
ln -s {logdrake,$(SBINDEST)/draklog}
- ln -s {mousedrake,$(SBINDEST)/drakmouse}
ln -s {scannerdrake,$(SBINDEST)/drakscanner}
check:
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 6cd23c7b9..20f81670a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,7 +1,7 @@
+- remove symlinks during install that are now handled in drakx-kbd-mouse-x11
- fix drakauth ldap configuration (mga#10005)
- ensure files are installed for nfs (mga#10301)
- stage2: add Feature:Independently_install_desktop_environments
-- add images for LXDE,E17,Razorqt,MATE for Feature:Independently_install_desktop_environments
- detect wifi cards managed by ssb driver (mga#9378)
Version 15.57 - 16 July 2013
diff --git a/perl-install/install/Makefile b/perl-install/install/Makefile
index f3a63da8f..cfbd6444a 100644
--- a/perl-install/install/Makefile
+++ b/perl-install/install/Makefile
@@ -15,29 +15,13 @@ all: xs
clean xs:
make -C .. $@
-dist-svn:
- mkdir -p $(PRODUCT)-$(VERSION)
- svn export -q -rBASE .. $(PRODUCT)-$(VERSION)/perl-install
- svn export -q -rBASE ../../tools $(PRODUCT)-$(VERSION)/tools
- svn export -q -rBASE ../../kernel $(PRODUCT)-$(VERSION)/kernel
- cp ../../Makefile.config $(PRODUCT)-$(VERSION)/
- tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION)
- rm -rf $(PRODUCT)-$(VERSION)
-
-dist-git:
- @cd ../..; git archive --prefix=$(PRODUCT)-$(VERSION)/ HEAD kernel perl-install tools Makefile.config | xz >$(PRODUCT)-$(VERSION).tar.xz;
- @echo WARNING: rpmsrate is MISSING!!!
-
tar:
rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION)
- @if [ -e "../../.svn" ]; then \
- $(MAKE) dist-svn; \
- elif [ -e "../../.git" ]; then \
- $(MAKE) dist-git; \
- else \
- echo "Unknown SCM (not SVN nor GIT)";\
- exit 1; \
- fi;
+ mkdir -p $(PRODUCT)-$(VERSION)/perl-install/install/share/
+ (cd ../..; git archive HEAD kernel perl-install tools Makefile.config) | tar xC $(PRODUCT)-$(VERSION)
+ svn export svn://svn.mageia.org/svn/packages/cauldron/meta-task/current/SOURCES $(PRODUCT)-$(VERSION)/perl-install/install/share/meta-task
+ tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION)
+ rm -rf $(PRODUCT)-$(VERSION)
$(info $(PRODUCT)-$(VERSION).tar.xz is ready)
install:
diff --git a/perl-install/install/help/po/.gitignore b/perl-install/install/help/po/.gitignore
new file mode 100644
index 000000000..cd1f2c943
--- /dev/null
+++ b/perl-install/install/help/po/.gitignore
@@ -0,0 +1 @@
+*.mo
diff --git a/perl-install/install/share/po/.gitignore b/perl-install/install/share/po/.gitignore
new file mode 100644
index 000000000..cd1f2c943
--- /dev/null
+++ b/perl-install/install/share/po/.gitignore
@@ -0,0 +1 @@
+*.mo
diff --git a/perl-install/share/po/.gitignore b/perl-install/share/po/.gitignore
new file mode 100644
index 000000000..cd1f2c943
--- /dev/null
+++ b/perl-install/share/po/.gitignore
@@ -0,0 +1 @@
+*.mo
diff --git a/rescue/Makefile b/rescue/Makefile
index e9b620dda..ef01f15de 100644
--- a/rescue/Makefile
+++ b/rescue/Makefile
@@ -13,30 +13,11 @@ install: $(RESCUE)
$(RESCUE): list.xml drvinst guessmounts lsparts rescue-doc make_rescue_img
DISTRIB_DESCR=$(DISTRIB_DESCR) ./make_rescue_img
-dist-svn:
- rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION)
- mkdir -p $(PRODUCT)-$(VERSION)/tools
- svn export -q -rBASE . $(PRODUCT)-$(VERSION)/rescue
- cp ../Makefile.config $(PRODUCT)-$(VERSION)/
- cp ../tools/install-xml-file-list $(PRODUCT)-$(VERSION)/tools
- tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION)
- rm -rf $(PRODUCT)-$(VERSION)
-
-dist-git:
- @cd ..; git archive --prefix=$(PRODUCT)-$(VERSION)/ HEAD rescue tools/install-xml-file-list Makefile.config | xz >$(PRODUCT)-$(VERSION).tar.xz;
-
dist: tar
tar:
rm -rf $(PRODUCT)*.tar* $(PRODUCT)-$(VERSION)
- @if [ -e "../.svn" ]; then \
- $(MAKE) dist-svn; \
- elif [ -e "../.git" ]; then \
- $(MAKE) dist-git; \
- else \
- echo "Unknown SCM (not SVN nor GIT)";\
- exit 1; \
- fi;
+ @cd ..; git archive --prefix=$(PRODUCT)-$(VERSION)/ HEAD rescue tools/install-xml-file-list Makefile.config | xz >$(PRODUCT)-$(VERSION).tar.xz;
$(info $(PRODUCT)-$(VERSION).tar.xz is ready)
clean: