Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow SOURCE_DATE_EPOCH=0 again #2756

Merged
merged 1 commit into from
Nov 9, 2023
Merged

Allow SOURCE_DATE_EPOCH=0 again #2756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build/files.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,6 +1035,7 @@ static void genCpioListAndHeader(FileList fl, Package pkg, int isSrc)
uint32_t defaultalgo = RPM_HASH_MD5, digestalgo;
rpm_loff_t totalFileSize = 0;
Header h = pkg->header; /* just a shortcut */
int override_date = 0;
time_t source_date_epoch = 0;
char *srcdate = getenv("SOURCE_DATE_EPOCH");

Expand All @@ -1050,6 +1051,7 @@ static void genCpioListAndHeader(FileList fl, Package pkg, int isSrc)
rpmlog(RPMLOG_ERR, _("unable to parse %s=%s\n"), "SOURCE_DATE_EPOCH", srcdate);
fl->processingFailed = 1;
}
override_date = 1;
}

/*
Expand Down Expand Up @@ -1195,7 +1197,7 @@ static void genCpioListAndHeader(FileList fl, Package pkg, int isSrc)
}
}

if (source_date_epoch && flp->fl_mtime > source_date_epoch) {
if (override_date && flp->fl_mtime > source_date_epoch) {
flp->fl_mtime = source_date_epoch;
}
/*
Expand Down
21 changes: 21 additions & 0 deletions tests/data/SPECS/source_date_epoch.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Name: test
Version: 1
Release: 1
Summary: test SOURCE_DATE_EPOCH
License: GPLv2
BuildArch: noarch

%global source_date_epoch_from_changelog 0
%global clamp_mtime_to_source_date_epoch 1
%global use_source_date_epoch_as_buildtime 1

%description

%build
echo "this is a test" > 0.txt

%install
%{__install} -m 644 -D 0.txt %{buildroot}/0.txt

%files
/0.txt
42 changes: 42 additions & 0 deletions tests/rpmbuild.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,48 @@ drwxrwxrwx 1 root root 0 Feb 20 2020 ./j/dir
[])
RPMTEST_CLEANUP

AT_SETUP([rpmbuild SOURCE_DATE_EPOCH])
AT_KEYWORDS([build])
RPMTEST_CHECK([
RPMDB_INIT

runroot \
--setenv SOURCE_DATE_EPOCH 1699460418 \
rpmbuild \
-bb --quiet \
--define "use_source_date_epoch_as_buildtime 1" \
--define "clamp_mtime_to_source_date_epoch 1" \
/data/SPECS/source_date_epoch.spec

runroot rpm -q --dump /build/RPMS/noarch/test-1-1.noarch.rpm
],
[0],
[/0.txt 15 1699460418 91751cee0a1ab8414400238a761411daa29643ab4b8243e9a91649e25be53ada 0100644 root root 0 0 0 X
],
[])
RPMTEST_CLEANUP

AT_SETUP([rpmbuild SOURCE_DATE_EPOCH=0])
AT_KEYWORDS([build])
RPMTEST_CHECK([
RPMDB_INIT

runroot \
--setenv SOURCE_DATE_EPOCH 0 \
rpmbuild \
-bb --quiet \
--define "use_source_date_epoch_as_buildtime 1" \
--define "clamp_mtime_to_source_date_epoch 1" \
/data/SPECS/source_date_epoch.spec

runroot rpm -q --dump /build/RPMS/noarch/test-1-1.noarch.rpm
],
[0],
[/0.txt 15 0 91751cee0a1ab8414400238a761411daa29643ab4b8243e9a91649e25be53ada 0100644 root root 0 0 0 X
],
[])
RPMTEST_CLEANUP

AT_SETUP([rpmbuild unpackaged files])
AT_KEYWORDS([build])
RPMDB_INIT
Expand Down