freebsd-update: remove $FreeBSD$ special case
Needs ReviewPublic
Actions

Authored by emaste on Nov 27 2024, 5:04 PM.

Details

Reviewers: None

Summary

Git is used for all supported FreeBSD versions, and $FreeBSD$ is either
not expanded or removed entirely.  We no longer need to compare files
except for $FreeBSD$.

Diff Detail

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

emaste requested review of this revision.Nov 27 2024, 5:04 PM

emaste created this revision.

emaste added inline comments.Nov 27 2024, 5:39 PM

usr.sbin/freebsd-update/freebsd-update.sh
2606–2607	I suspect that this case ("differs ... only due to RCS tag expansion") is no longer applicable and should just be removed instead

Actually I think all of these cases no longer exist and we can just remove this functionality altogether.

emaste updated this revision to Diff 147069.Nov 27 2024, 5:41 PM

Revision Contents
Changeset List

Path

Size

usr.sbin/

freebsd-update/

freebsd-update.sh

36 lines

Diff 147069

View Options

usr.sbin/freebsd-update/freebsd-update.sh

	Show All 39 Lines

	#define jiffies ticks			#define jiffies ticks
	#define jiffies_64 ticks			#define jiffies_64 ticks
	#define jiffies_to_msecs(x) (((int64_t)(int)(x)) * 1000 / hz)			#define jiffies_to_msecs(x) (((int64_t)(int)(x)) * 1000 / hz)

	#define MAX_JIFFY_OFFSET ((INT_MAX >> 1) - 1)			#define MAX_JIFFY_OFFSET ((INT_MAX >> 1) - 1)

	#define time_after(a, b) ((int)((b) - (a)) < 0)			#define time_after(a, b) ((int)((b) - (a)) < 0)
				#define time_after32(a, b) ((int32_t)((uint32_t)(b) - (uint32_t)(a)) < 0)
				hselaskyUnsubmitted Done Inline Actions Define time_after32() like time_after() . int is always 32-bit on our platforms. Else a lot of things will break. hselasky: Define time_after32() like time_after() . int is always 32-bit on our platforms. Else a lot of…
				manuAuthorUnsubmitted Done Inline Actions Linux cast the operand to uint32_t, I guess some code can rely on that. manu: Linux cast the operand to uint32_t, I guess some code can rely on that.
				hselaskyUnsubmitted Done Inline Actions I don't see how casting the arguments makes any difference in C- ? Can you investigate? Adding Konstantin here. hselasky: I don't see how casting the arguments makes any difference in C- ? Can you investigate?
	#define time_before(a, b) time_after(b,a)			#define time_before(a, b) time_after(b,a)
				#define time_before32(a, b) time_after32(b, a)
	#define time_after_eq(a, b) ((int)((a) - (b)) >= 0)			#define time_after_eq(a, b) ((int)((a) - (b)) >= 0)
	#define time_before_eq(a, b) time_after_eq(b, a)			#define time_before_eq(a, b) time_after_eq(b, a)
	#define time_in_range(a,b,c) \			#define time_in_range(a,b,c) \
	(time_after_eq(a,b) && time_before_eq(a,c))			(time_after_eq(a,b) && time_before_eq(a,c))
	#define time_is_after_eq_jiffies(a) time_after_eq(a, jiffies)			#define time_is_after_eq_jiffies(a) time_after_eq(a, jiffies)

	#define HZ hz			#define HZ hz

	▲ Show 20 Lines • Show All 108 Lines • Show Last 20 Lines

freebsd-update: remove $FreeBSD$ special caseNeeds ReviewPublicActions