diff --git a/grub2-xcat.recompile/Makefile b/grub2-xcat.recompile/Makefile index 8ebce07..66dafa7 100644 --- a/grub2-xcat.recompile/Makefile +++ b/grub2-xcat.recompile/Makefile @@ -5,7 +5,7 @@ SRC_RPM = grub2-2.02-0.16.ael7b.src.rpm SPEC_TEMPLATE = grub2-xcat.spec.template -BUILD_NUMBER_FILE = build-number.txt +#BUILD_NUMBER_FILE = build-number.txt build: rpm @@ -14,7 +14,7 @@ deb: grub2-xcat.all.deb grub2.ppc64.rpm: $(SRC_RPM) rpmbuild --rebuild $^ 2>&1 | tee rpmbuild.out - ln -sf $$(awk '/Wrote: .*\/grub2-[0-9].*\.rpm/ { print $$NF }' rpmbuild.out) \ + cp -f $$(awk '/Wrote: .*\/grub2-[0-9].*\.rpm/ { print $$NF }' rpmbuild.out) \ grub2.ppc64.rpm timestamp.extract: grub2.ppc64.rpm @@ -30,7 +30,8 @@ timestamp.grub2.mknetdir: timestamp.extract --net-directory=grub2-xcat/tftpboot touch timestamp.grub2.mknetdir -grub2-xcat.spec: $(SPEC_TEMPLATE) $(BUILD_NUMBER_FILE) timestamp.grub2.mknetdir +#grub2-xcat.spec: $(SPEC_TEMPLATE) $(BUILD_NUMBER_FILE) timestamp.grub2.mknetdir +grub2-xcat.spec: $(SPEC_TEMPLATE) timestamp.grub2.mknetdir umask 0022 ( cd grub2-xcat ; find tftpboot -type d -exec echo '%dir "/{}"' ';' ) >filelist ( cd grub2-xcat ; find tftpboot -type f -exec echo '"/{}"' ';' ) >>filelist @@ -38,9 +39,11 @@ grub2-xcat.spec: $(SPEC_TEMPLATE) $(BUILD_NUMBER_FILE) timestamp.grub2.mknetdir # 's@###<<>>###@build'$$(cat $(BUILD_NUMBER_FILE))'.xcat@g' \ # -e '/%files/ r filelist' >$@ cat $(SPEC_TEMPLATE) | sed -e \ - 's@###<<>>###@build'$$(date +"%Y%m%d%H%M")'@g' \ + 's@###<<>>###@snap'$$(date +"%Y%m%d%H%M")'@g' \ -e 's@###<<>>###@'$$(rpm -qpf --qf "%{RELEASE}" $(SRC_RPM) )'@g' \ -e 's@###<<>>###@'$$(rpm -qpf --qf "%{VERSION}" $(SRC_RPM) )'@g' \ + -e 's@###<<>>###@'$$(echo $(SRC_RPM))'@g' \ + -e 's@###<<>>###@'$$(git log --pretty=%h -1 ./)'@g' \ -e '/%files/ r filelist' >$@ $(RM) filelist @@ -50,17 +53,17 @@ grub2-xcat.noarch.rpm: grub2-xcat.spec timestamp.grub2.mknetdir ( cd grub2-xcat ; tar cf - . ) | ( cd grub2-xcat-repack ; tar xf - ) ( cd grub2-xcat-repack ; rpmbuild -bb ../grub2-xcat.spec --buildroot=`pwd` ) 2>&1 | \ tee rpmbuild.out.2 - ln -sf $$(awk -F '/' '/Wrote: .*\/grub2-xcat-[0-9].*\.rpm/ { print $$NF }' \ + cp -f $$(awk -F '/' '/Wrote: .*\/grub2-xcat-[0-9].*\.rpm/ { print $$NF }' \ rpmbuild.out.2) grub2-xcat.noarch.rpm grub2-xcat.all.deb: grub2-xcat.noarch.rpm alien -d -c -k $^ 2>&1 | tee alien.out - ln -sf $$(awk '/grub2-xcat_.*_all.deb generated/ { print $$1 }' \ + cp -f $$(awk '/grub2-xcat_.*_all.deb generated/ { print $$1 }' \ alien.out) grub2-xcat.all.deb -$(BUILD_NUMBER_FILE): $(SPEC_TEMPLATE) $(BINARY_RPM) - @if ! test -f $(BUILD_NUMBER_FILE); then echo 0 > $(BUILD_NUMBER_FILE); fi - @echo $$(($$(cat $(BUILD_NUMBER_FILE)) + 1)) > $(BUILD_NUMBER_FILE) +#$(BUILD_NUMBER_FILE): $(SPEC_TEMPLATE) $(BINARY_RPM) +# @if ! test -f $(BUILD_NUMBER_FILE); then echo 0 > $(BUILD_NUMBER_FILE); fi +# @echo $$(($$(cat $(BUILD_NUMBER_FILE)) + 1)) > $(BUILD_NUMBER_FILE) clean: $(RM) rpmbuild.out grub2.ppc64.rpm diff --git a/grub2-xcat.recompile/grub2-2.02-0.16.xcat.src.rpm b/grub2-xcat.recompile/grub2-2.02-0.16.xcat.src.rpm deleted file mode 100644 index 596f700..0000000 Binary files a/grub2-xcat.recompile/grub2-2.02-0.16.xcat.src.rpm and /dev/null differ diff --git a/grub2-xcat.recompile/grub2-xcat.spec.template b/grub2-xcat.recompile/grub2-xcat.spec.template index a40836a..d63f85b 100644 --- a/grub2-xcat.recompile/grub2-xcat.spec.template +++ b/grub2-xcat.recompile/grub2-xcat.spec.template @@ -1,7 +1,7 @@ BuildArch: noarch Name: grub2-xcat -Version: 2.02 -Release: 0.16.###<<>>### +Version: ###<<>>### +Release: ###<<>>###.###<<>>### Summary: grub2 resources generated by grub2-mknetdir License: GPLv3+ Distribution: Slackware/tarball @@ -15,6 +15,7 @@ Vendor: IBM Corp. %description grub2-xcat provides some grub2 resources generated by grub2-mknetdir,including grub2 modules and grub2 image. +The grub2 resource is built based on ###<<>>### with grub2-xcat(git hash:###<<>>###) in xcat-dep %files