CA-45498: Remove proprietary objects patch altogether.

Mainly to remove a warning regarding the empty diff during SRPM build.

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>

diff --git a/mk/Makefile b/mk/Makefile
index e9d629d15e609de8b1ea434075a489bbfbd75acf..bd8224c4edd2aabb6f701ad4195c9d8eb60a1b6d 100644 (file)
--- a/mk/Makefile
+++ b/mk/Makefile
@@ -24,7 +24,6 @@ CHANGELOG_HEADER  := * $(CHANGELOG_DATE) $(CHANGELOG_USER) [$(BLKTAP_VERSION) $(
 CHANGELOG_MESSAGE := - Build blktap.
 
 SOURCES = $(RPM_SOURCESDIR)/blktap-$(BLKTAP_VERSION).tar.bz2 \
-          $(RPM_SOURCESDIR)/blktap-development.patch \
           $(RPM_SOURCESDIR)/blktap-udev-ignore-tapdevs.patch \
           $(RPM_SPECSDIR)/blktap.spec
 
@@ -39,53 +38,13 @@ clean:
        rm -f $(SOURCES) $(SOURCES:%=%.tainted)
        rm -f $(MY_OBJ_DIR)/proprietary.code.check.stamp
 
-PROPRIETARY_SOURCE :=
-PROPRIETARY_SOURCE += mk/Makefile
-PROPRIETARY_SOURCE += mk/blktap.spec.in
-
-PROPRIETARY_C_DRIVERS += $(filter drivers/%.c,$(PROPRIETARY_SOURCE))
-PROPRIETARY_C_LIBVHD += $(filter vhd/lib/%.c,$(PROPRIETARY_SOURCE))
-PROPRIETARY_C_VHD += $(filter vhd/%.c,$(PROPRIETARY_SOURCE))
-SOURCES += $(patsubst drivers/%.c,$(RPM_SOURCESDIR)/drivers/%.o,$(PROPRIETARY_C_DRIVERS))
-SOURCES += $(patsubst vhd/lib/%.c,$(RPM_SOURCESDIR)/vhd/lib/%.o,$(PROPRIETARY_C_LIBVHD))
-SOURCES += $(patsubst vhd/%.c,$(RPM_SOURCESDIR)/vhd/%.o,$(PROPRIETARY_C_VHD))
-
-HG_EXCLUDE := $(PROPRIETARY_SOURCE:%=-X "%")
-
-$(MY_OBJ_DIR)/proprietary.code.check.stamp:
-       @for i in $(filter-out mk/%,$(PROPRIETARY_SOURCE)) ; do \
-           echo "Checking $${i} for proprietary code marker" ; \
-           if ! grep -q "XenSource proprietary code." $(REPO)/$${i} ; then \
-               echo "ERROR: source code marker not found in $${i}" ; \
-               exit 1 ; \
-           fi ; \
-       done
-       touch $@
-
 $(RPM_SOURCESDIR)/%.o:
        rm -f $(REPO)/$(dir $*).$(notdir $*).o.d $(REPO)/$*.o
        make -C $(REPO)/$(dir $*) USE_SYSTEM_LIBRARIES=y $(notdir $*.o)
        mv $(REPO)/$*.o $(RPM_SOURCESDIR)/$(notdir $*.o)
 
-$(RPM_SOURCESDIR)/blktap-$(BLKTAP_VERSION).tar.bz2: $(MY_OBJ_DIR)/proprietary.code.check.stamp \
-                                                   $(RPM_SOURCESDIR)/.dirstamp $(REPO)
+$(RPM_SOURCESDIR)/blktap-$(BLKTAP_VERSION).tar.bz2: $(RPM_SOURCESDIR)/.dirstamp $(REPO)
        cd $(REPO) && hg archive -t tbz2 $(HG_EXCLUDE) $@
-       @if tar xjOf $@ | grep -q "XenSource proprietary code." ; then \
-           echo "ERROR: $@ contains XenSource proprietary code!"; \
-           echo "       Saved as $@.tainted" ; \
-           mv $@ $@.tainted ; \
-           /bin/false ; \
-       fi
-
-$(RPM_SOURCESDIR)/blktap-development.patch: $(MY_OBJ_DIR)/proprietary.code.check.stamp \
-                                            $(RPM_SOURCESDIR)/.dirstamp $(REPO)
-       cd $(REPO) && hg diff $(HG_EXCLUDE) > $@
-       @if grep -q "XenSource proprietary code." $@ ; then \
-           echo "ERROR: $@ contains XenSource proprietary code!"; \
-           echo "       Saved as $@.tainted" ; \
-           mv $@ $@.tainted ; \
-           /bin/false ; \
-       fi
 
 $(RPM_SOURCESDIR)/%.patch: %.patch
        cp $< $@

diff --git a/mk/blktap.spec.in b/mk/blktap.spec.in
index 9e474d118ca1929ec7e40ffc6681687870a03647..4a13121715994a9c8f54cef9a41a7ebf19b030db 100644 (file)
--- a/mk/blktap.spec.in
+++ b/mk/blktap.spec.in
@@ -6,7 +6,6 @@ License: Proprietary
 Group: System/Hypervisor
 Source0: %{name}-%{version}.tar.bz2
 
-Patch0: %{name}-development.patch
 Patch1: %{name}-udev-ignore-tapdevs.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Obsoletes: xen-blktap
@@ -25,7 +24,6 @@ This package contains the blktap development libraries and header files.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
 %build