QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anaconda: prevent anaconda.spec from regenerating

Browse Source 
The only dynamic field is VERSION, so it isn't worth (but makes some
confusion).
This commit is contained in:
Marek Marczykowski 2013-03-26 08:37:43 +01:00
parent 043b780ed9
commit 3b444d3d65
3 changed files with 10 additions and 5961 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
anaconda/Makefile.am
View File

@ -22,14 +22,13 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = pyanaconda po data \ SUBDIRS = pyanaconda po data \
tests utils scripts docs dracut widgets tests utils scripts docs dracut widgets
EXTRA_DIST = config.rpath COPYING \ EXTRA_DIST = config.rpath COPYING
anaconda.spec.in
MAINTAINERCLEANFILES = Makefile.in config.guess config.h.in config.sub \ MAINTAINERCLEANFILES = Makefile.in config.guess config.h.in config.sub \
depcomp install-sh ltmain.sh missing ABOUT-NLS \ depcomp install-sh ltmain.sh missing ABOUT-NLS \
INSTALL aclocal.m4 configure *.pyc py-compile INSTALL aclocal.m4 configure *.pyc py-compile
CLEANFILES = *~ anaconda.spec CLEANFILES = *~
MOSTLYCLEANDIRS = m4 MOSTLYCLEANDIRS = m4
@ -46,8 +45,8 @@ sed_verbose_0 = @echo " SED "$@;
TX_PULL_ARGS = -a --disable-overwrite TX_PULL_ARGS = -a --disable-overwrite
TX_PUSH_ARGS = -s TX_PUSH_ARGS = -s
$(PACKAGE_NAME).spec: $(PACKAGE_NAME).spec.in #$(PACKAGE_NAME).spec: $(PACKAGE_NAME).spec.in
$(sed_verbose)sed -e 's/#VERSION#/$(PACKAGE_VERSION)/' < $< > $@ # $(sed_verbose)sed -e 's/#VERSION#/$(PACKAGE_VERSION)/' < $< > $@
tag: tag:
@git tag -s -a -m "Tag as $(ARCHIVE_TAG)" $(ARCHIVE_TAG) @git tag -s -a -m "Tag as $(ARCHIVE_TAG)" $(ARCHIVE_TAG)
@ -85,7 +84,7 @@ bumpver: po-pull
tx push $(TX_PUSH_ARGS) tx push $(TX_PUSH_ARGS)
install-buildrequires: install-buildrequires:
yum install $$(grep BuildRequires: anaconda.spec.in | cut -d ' ' -f 2) yum install $$(grep BuildRequires: anaconda.spec | cut -d ' ' -f 2)
# Generate an updates.img based on the changed files since the release # Generate an updates.img based on the changed files since the release
# was tagged. Updates are copied to ./updates-img and then the image is # was tagged. Updates are copied to ./updates-img and then the image is

12
anaconda/Makefile.in
View File

@ -389,14 +389,12 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = pyanaconda po data \ SUBDIRS = pyanaconda po data \
tests utils scripts docs dracut widgets tests utils scripts docs dracut widgets
EXTRA_DIST = config.rpath COPYING \ EXTRA_DIST = config.rpath COPYING
anaconda.spec.in
MAINTAINERCLEANFILES = Makefile.in config.guess config.h.in config.sub \ MAINTAINERCLEANFILES = Makefile.in config.guess config.h.in config.sub \
depcomp install-sh ltmain.sh missing ABOUT-NLS \ depcomp install-sh ltmain.sh missing ABOUT-NLS \
INSTALL aclocal.m4 configure *.pyc py-compile INSTALL aclocal.m4 configure *.pyc py-compile
CLEANFILES = *~ anaconda.spec CLEANFILES = *~
MOSTLYCLEANDIRS = m4 MOSTLYCLEANDIRS = m4
dist_noinst_DATA = $(PACKAGE_NAME).spec dist_noinst_DATA = $(PACKAGE_NAME).spec
dist_sbin_SCRIPTS = anaconda dist_sbin_SCRIPTS = anaconda
@ -954,8 +952,8 @@ uninstall-am: uninstall-dist_sbinSCRIPTS
uninstall-dist_sbinSCRIPTS uninstall-dist_sbinSCRIPTS
$(PACKAGE_NAME).spec: $(PACKAGE_NAME).spec.in #$(PACKAGE_NAME).spec: $(PACKAGE_NAME).spec.in
$(sed_verbose)sed -e 's/#VERSION#/$(PACKAGE_VERSION)/' < $< > $@ # $(sed_verbose)sed -e 's/#VERSION#/$(PACKAGE_VERSION)/' < $< > $@
tag: tag:
@git tag -s -a -m "Tag as $(ARCHIVE_TAG)" $(ARCHIVE_TAG) @git tag -s -a -m "Tag as $(ARCHIVE_TAG)" $(ARCHIVE_TAG)
@ -993,7 +991,7 @@ bumpver: po-pull
tx push $(TX_PUSH_ARGS) tx push $(TX_PUSH_ARGS)
install-buildrequires: install-buildrequires:
yum install $$(grep BuildRequires: anaconda.spec.in | cut -d ' ' -f 2) yum install $$(grep BuildRequires: anaconda.spec | cut -d ' ' -f 2)
# Generate an updates.img based on the changed files since the release # Generate an updates.img based on the changed files since the release
# was tagged. Updates are copied to ./updates-img and then the image is # was tagged. Updates are copied to ./updates-img and then the image is

5948
anaconda/anaconda.spec.in
View File

File diff suppressed because it is too large Load Diff