diff options
| -rw-r--r-- | meta-networking/recipes-support/ntp/ntp/reproducibility-respect-source-date-epoch.patch | 16 | ||||
| -rw-r--r-- | meta-networking/recipes-support/ntp/ntp_4.2.8p14.bb (renamed from meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb) | 7 |
2 files changed, 3 insertions, 20 deletions
diff --git a/meta-networking/recipes-support/ntp/ntp/reproducibility-respect-source-date-epoch.patch b/meta-networking/recipes-support/ntp/ntp/reproducibility-respect-source-date-epoch.patch deleted file mode 100644 index 58e71c3b8b..0000000000 --- a/meta-networking/recipes-support/ntp/ntp/reproducibility-respect-source-date-epoch.patch +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | --- ntp-4.2.8p12.original/scripts/build/mkver.in 2018-11-12 14:06:49.333020430 +1300 | ||
| 2 | +++ ntp-4.2.8p12/scripts/build/mkver.in 2018-11-12 14:15:04.947480167 +1300 | ||
| 3 | @@ -15,7 +15,12 @@ | ||
| 4 | *) ConfStr="${ConfStr}-@VER_SUFFIX@" ;; | ||
| 5 | esac | ||
| 6 | |||
| 7 | -ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`" | ||
| 8 | +if [ -n "$SOURCE_DATE_EPOCH" ]; then | ||
| 9 | + ConfStr="$ConfStr `LC_TIME=C TZ=UTC date -d@$SOURCE_DATE_EPOCH 2>/dev/null`" || | ||
| 10 | + ConfStr="$ConfStr `LC_TIME=C TZ=UTC date -r $SOURCE_DATE_EPOCH`" | ||
| 11 | +else | ||
| 12 | + ConfStr="$ConfStr `LC_TIME=C TZ=UTC date`" | ||
| 13 | +fi | ||
| 14 | |||
| 15 | if [ ! -f .version ]; then | ||
| 16 | echo 0 > .version | ||
diff --git a/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb b/meta-networking/recipes-support/ntp/ntp_4.2.8p14.bb index e950fabe38..cdf66082f2 100644 --- a/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb +++ b/meta-networking/recipes-support/ntp/ntp_4.2.8p14.bb | |||
| @@ -6,14 +6,13 @@ or satellite receiver or modem." | |||
| 6 | HOMEPAGE = "http://support.ntp.org" | 6 | HOMEPAGE = "http://support.ntp.org" |
| 7 | SECTION = "net" | 7 | SECTION = "net" |
| 8 | LICENSE = "NTP" | 8 | LICENSE = "NTP" |
| 9 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4cee33257467509e498f4cd9a6a4bd53" | 9 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4190b39435611e92a4da74e682623f19" |
| 10 | 10 | ||
| 11 | DEPENDS = "libevent" | 11 | DEPENDS = "libevent" |
| 12 | 12 | ||
| 13 | SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \ | 13 | SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \ |
| 14 | file://ntp-4.2.4_p6-nano.patch \ | 14 | file://ntp-4.2.4_p6-nano.patch \ |
| 15 | file://reproducibility-fixed-path-to-posix-shell.patch \ | 15 | file://reproducibility-fixed-path-to-posix-shell.patch \ |
| 16 | file://reproducibility-respect-source-date-epoch.patch \ | ||
| 17 | file://ntpd \ | 16 | file://ntpd \ |
| 18 | file://ntp.conf \ | 17 | file://ntp.conf \ |
| 19 | file://ntpdate \ | 18 | file://ntpdate \ |
| @@ -25,8 +24,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g | |||
| 25 | file://ntpd.list \ | 24 | file://ntpd.list \ |
| 26 | " | 25 | " |
| 27 | 26 | ||
| 28 | SRC_URI[md5sum] = "ea040ab9b4ca656b5229b89d6b822f13" | 27 | SRC_URI[md5sum] = "783edaf1d68ddf651bde64eda54a579d" |
| 29 | SRC_URI[sha256sum] = "288772cecfcd9a53694ffab108d1825a31ba77f3a8466b0401baeca3bc232a38" | 28 | SRC_URI[sha256sum] = "1960e4f081f6aafd108d721bc3ab15f9e8dfd08dc08339aa95bca9d2545e4eb7" |
| 30 | 29 | ||
| 31 | inherit autotools update-rc.d useradd systemd pkgconfig | 30 | inherit autotools update-rc.d useradd systemd pkgconfig |
| 32 | 31 | ||
