Commit 81afbd84 authored by Andreas Beckmann's avatar Andreas Beckmann

drop our reproducibility patches, refresh others, drop symbols

parent ad0fe937
libXNVCtrl.so.0 #PACKAGE# #MINVER#
NV_ID@Base 337
#MISSING: 390.67# NV_ID@Base 337
XNVCTRLBindWarpPixmapName@Base 313
XNVCTRLIsNvScreen@Base 0
XNVCTRLQueryAttribute@Base 0
......@@ -30,4 +30,4 @@ libXNVCtrl.so.0 #PACKAGE# #MINVER#
XNVCTRLStringOperation@Base 0
XNVCtrlSelectNotify@Base 0
XNVCtrlSelectTargetNotify@Base 0
pNV_ID@Base 337
#MISSING: 390.67# pNV_ID@Base 337
......@@ -14,7 +14,7 @@ Bug-Debian: https://bugs.debian.org/666909
XCONFIG_PARSER_DIR ?= XF86Config-parser
COMMON_UTILS_DIR ?= common-utils
COMMON_UNIX_DIR ?= common-unix
@@ -286,9 +289,9 @@ NVIDIA_SETTINGS_install: $(NVIDIA_SETTIN
@@ -282,9 +285,9 @@ NVIDIA_SETTINGS_install: $(NVIDIA_SETTIN
$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
$(eval $(call DEBUG_INFO_RULES, $(NVIDIA_SETTINGS)))
......@@ -26,7 +26,7 @@ Bug-Debian: https://bugs.debian.org/666909
$(eval $(call DEBUG_INFO_RULES, $(GTK2LIB)))
$(GTK2LIB).unstripped: $(GTK2_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
@@ -296,7 +299,7 @@ $(GTK2LIB).unstripped: $(GTK2_OBJS) $(XC
@@ -292,7 +295,7 @@ $(GTK2LIB).unstripped: $(GTK2_OBJS) $(XC
-o $@ \
-Wl,-soname -Wl,$(GTK2LIB_SONAME) \
$(GTK2_OBJS) $(IMAGE_OBJS) $(XCP_OBJS) \
......@@ -35,7 +35,7 @@ Bug-Debian: https://bugs.debian.org/666909
ifdef BUILD_GTK3LIB
$(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
@@ -305,7 +308,7 @@ $(GTK3LIB).unstripped: $(GTK3_OBJS) $(XC
@@ -301,7 +304,7 @@ $(GTK3LIB).unstripped: $(GTK3_OBJS) $(XC
-o $@ \
-Wl,-soname -Wl,$(GTK3LIB_SONAME) \
$(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) \
......@@ -44,8 +44,8 @@ Bug-Debian: https://bugs.debian.org/666909
endif
# define the rule to build each object file
@@ -316,7 +319,7 @@ $(foreach src,$(XCP_SRC),$(eval $(call D
$(eval $(call DEFINE_STAMP_C_RULE, $(OBJS),$(NVIDIA_SETTINGS_PROGRAM_NAME)))
@@ -309,7 +312,7 @@ $(foreach src,$(SRC),$(eval $(call DEFIN
$(foreach src,$(XCP_SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
# define the rule to build $(XNVCTRL_ARCHIVE)
-$(XNVCTRL_ARCHIVE): build-xnvctrl
......@@ -55,7 +55,7 @@ Bug-Debian: https://bugs.debian.org/666909
@$(MAKE) -C $(XNVCTRL_DIR) -f $(XNVCTRL_MAKEFILE)
--- a/src/libXNVCtrl/Makefile
+++ b/src/libXNVCtrl/Makefile
@@ -58,10 +58,17 @@ OBJS = $(call BUILD_OBJECT_LIST,$(SRC))
@@ -57,13 +57,21 @@ OBJS = $(call BUILD_OBJECT_LIST,$(SRC))
.PHONY: clean
all: $(LIBXNVCTRL)
......@@ -73,8 +73,7 @@ Bug-Debian: https://bugs.debian.org/666909
# define the rule to build each object file
$(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
@@ -71,3 +78,4 @@ $(eval $(call DEFINE_STAMP_C_RULE, $(OBJ
clean:
rm -rf $(LIBXNVCTRL) *~ $(STAMP_C) \
rm -rf $(LIBXNVCTRL) *~ \
$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
+ rm -f libXNVCtrl.so libXNVCtrl.so.*
Author: luca.boccassi@gmail.com
Description: Reproducible builds: use SOURCE_DATE_EPOCH for STAMP_C
Forwarded: https://github.com/NVIDIA/nvidia-settings/pull/12
If SOURCE_DATE_EPOCH is available use it instead of the current date
in order to allow for reproducible builds.
The fallback is date for backward compatibility.
Snippet adapted from:
https://wiki.debian.org/ReproducibleBuilds/TimestampsProposal#Makefile
--- a/src/libXNVCtrl/utils.mk
+++ b/src/libXNVCtrl/utils.mk
@@ -432,6 +432,12 @@ endef
STAMP_C = $(OUTPUTDIR)/g_stamp.c
+ifdef SOURCE_DATE_EPOCH
+ BUILD_DATE ?= $(shell $(DATE) -u -d "@$(SOURCE_DATE_EPOCH)" 2>/dev/null || $(DATE) -u -r "$(SOURCE_DATE_EPOCH)" 2>/dev/null || $(DATE) -u)
+else
+ BUILD_DATE ?= $(shell $(DATE))
+endif
+
define DEFINE_STAMP_C_RULE
$$(STAMP_C): $$(filter-out \
@@ -443,7 +449,7 @@ define DEFINE_STAMP_C_RULE
@ $$(PRINTF) "%s" "version $$(NVIDIA_VERSION) " >> $$@
@ $$(PRINTF) "%s" "($$(shell $$(WHOAMI))" >> $$@
@ $$(PRINTF) "%s" "@$$(shell $$(HOSTNAME_CMD))) " >> $$@
- @ $$(PRINTF) "%s\n" "$$(shell $(DATE))\";" >> $$@
+ @ $$(PRINTF) "%s\n" "$$(BUILD_DATE)\";" >> $$@
@ $$(PRINTF) "%s\n" "const char *pNV_ID = NV_ID + 11;" >> $$@
endef
--- a/utils.mk
+++ b/utils.mk
@@ -435,6 +435,12 @@ endef
STAMP_C = $(OUTPUTDIR)/g_stamp.c
+ifdef SOURCE_DATE_EPOCH
+ BUILD_DATE ?= $(shell $(DATE) -u -d "@$(SOURCE_DATE_EPOCH)" 2>/dev/null || $(DATE) -u -r "$(SOURCE_DATE_EPOCH)" 2>/dev/null || $(DATE) -u)
+else
+ BUILD_DATE ?= $(shell $(DATE))
+endif
+
define DEFINE_STAMP_C_RULE
$$(STAMP_C): $$(filter-out \
@@ -446,7 +452,7 @@ define DEFINE_STAMP_C_RULE
@ $$(PRINTF) "%s" "version $$(NVIDIA_VERSION) " >> $$@
@ $$(PRINTF) "%s" "($$(shell $$(WHOAMI))" >> $$@
@ $$(PRINTF) "%s" "@$$(shell $$(HOSTNAME_CMD))) " >> $$@
- @ $$(PRINTF) "%s\n" "$$(shell $(DATE))\";" >> $$@
+ @ $$(PRINTF) "%s\n" "$$(BUILD_DATE)\";" >> $$@
@ $$(PRINTF) "%s\n" "const char *pNV_ID = NV_ID + 11;" >> $$@
endef
Author: luca.boccassi@gmail.com
Description: Reproducible builds: use SOURCE_DATE_EPOCH for manpage
Forwarded: https://github.com/NVIDIA/nvidia-settings/pull/12
If SOURCE_DATE_EPOCH is available use it instead of the current date
in order to allow for reproducible builds.
The fallback is date +%F for backward compatibility.
Snippet adapted from:
https://wiki.debian.org/ReproducibleBuilds/TimestampsProposal#Makefile
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -104,12 +104,19 @@ $(GEN_MANPAGE_OPTS): $(GEN_MANPAGE_OPTS_
$(OPTIONS_1_INC): $(GEN_MANPAGE_OPTS)
@$< > $@
+DATE_FMT = %F
+ifdef SOURCE_DATE_EPOCH
+ BUILD_DATE ?= $(shell $(DATE) -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || $$(DATE) -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || $(DATE) -u "+$(DATE_FMT)")
+else
+ BUILD_DATE ?= $(shell $(DATE) "+$(DATE_FMT)")
+endif
+
$(MANPAGE_not_gzipped): nvidia-settings.1.m4 $(OPTIONS_1_INC) $(VERSION_MK)
$(call quiet_cmd,M4) \
-D__HEADER__=$(AUTO_TEXT) \
-D__BUILD_OS__=$(TARGET_OS) \
-D__VERSION__=$(NVIDIA_VERSION) \
- -D__DATE__="`$(DATE) +%F`" \
+ -D__DATE__="$(BUILD_DATE)" \
-I $(OUTPUTDIR) \
$< > $@
Author: luca.boccassi@gmail.com
Description: Reproducible builds: use dummy hostname/user for STAMP_C
Forwarded: https://github.com/NVIDIA/nvidia-settings/pull/12
Use dummy values instead of the real hostname and user when
generating STAMP_C if SOURCE_DATE_EPOCH is available, which is a good
enough indicator that the user/packager wants to achieve reproducible
builds.
Fall back to WHOAMI and HOSTNAME_CMD otherwise for backward
compatibility.
--- a/src/libXNVCtrl/utils.mk
+++ b/src/libXNVCtrl/utils.mk
@@ -434,8 +434,12 @@ STAMP_C = $(OUTPUTDIR)/g_stamp.c
ifdef SOURCE_DATE_EPOCH
BUILD_DATE ?= $(shell $(DATE) -u -d "@$(SOURCE_DATE_EPOCH)" 2>/dev/null || $(DATE) -u -r "$(SOURCE_DATE_EPOCH)" 2>/dev/null || $(DATE) -u)
+ BUILD_USER ?= build-user
+ BUILD_HOST ?= build-machine
else
BUILD_DATE ?= $(shell $(DATE))
+ BUILD_USER ?= $(shell $(WHOAMI))
+ BUILD_HOST ?= $(shell $(HOSTNAME_CMD))
endif
define DEFINE_STAMP_C_RULE
@@ -447,8 +451,8 @@ define DEFINE_STAMP_C_RULE
@ $$(PRINTF) "%s" "const char NV_ID[] = \"nvidia id: " >> $$@
@ $$(PRINTF) "%s" "$(2): " >> $$@
@ $$(PRINTF) "%s" "version $$(NVIDIA_VERSION) " >> $$@
- @ $$(PRINTF) "%s" "($$(shell $$(WHOAMI))" >> $$@
- @ $$(PRINTF) "%s" "@$$(shell $$(HOSTNAME_CMD))) " >> $$@
+ @ $$(PRINTF) "%s" "($$(BUILD_USER)" >> $$@
+ @ $$(PRINTF) "%s" "@$$(BUILD_HOST)) " >> $$@
@ $$(PRINTF) "%s\n" "$$(BUILD_DATE)\";" >> $$@
@ $$(PRINTF) "%s\n" "const char *pNV_ID = NV_ID + 11;" >> $$@
--- a/utils.mk
+++ b/utils.mk
@@ -437,8 +437,12 @@ STAMP_C = $(OUTPUTDIR)/g_stamp.c
ifdef SOURCE_DATE_EPOCH
BUILD_DATE ?= $(shell $(DATE) -u -d "@$(SOURCE_DATE_EPOCH)" 2>/dev/null || $(DATE) -u -r "$(SOURCE_DATE_EPOCH)" 2>/dev/null || $(DATE) -u)
+ BUILD_USER ?= build-user
+ BUILD_HOST ?= build-machine
else
BUILD_DATE ?= $(shell $(DATE))
+ BUILD_USER ?= $(shell $(WHOAMI))
+ BUILD_HOST ?= $(shell $(HOSTNAME_CMD))
endif
define DEFINE_STAMP_C_RULE
@@ -450,8 +454,8 @@ define DEFINE_STAMP_C_RULE
@ $$(PRINTF) "%s" "const char NV_ID[] = \"nvidia id: " >> $$@
@ $$(PRINTF) "%s" "$(2): " >> $$@
@ $$(PRINTF) "%s" "version $$(NVIDIA_VERSION) " >> $$@
- @ $$(PRINTF) "%s" "($$(shell $$(WHOAMI))" >> $$@
- @ $$(PRINTF) "%s" "@$$(shell $$(HOSTNAME_CMD))) " >> $$@
+ @ $$(PRINTF) "%s" "($$(BUILD_USER)" >> $$@
+ @ $$(PRINTF) "%s" "@$$(BUILD_HOST)) " >> $$@
@ $$(PRINTF) "%s\n" "$$(BUILD_DATE)\";" >> $$@
@ $$(PRINTF) "%s\n" "const char *pNV_ID = NV_ID + 11;" >> $$@
......@@ -8,6 +8,3 @@ link-order.diff
typos.diff
kfreebsd-hurd.diff
xorg.patch
SOURCE_DATE_EPOCH-for-manpage.patch
SOURCE_DATE_EPOCH-for-STAMP_C.patch
dummy-hostname-user-for-STAMP_C.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment