Attachment #188827 for bug #224341

View | Details | Raw Unified | Return to bug 224341
Collapse All | Expand All





DISTVERSIONSUFFIX?=	-${RPMVERSION}

.ifndef MASTER_SITES
.if ${linux_ARGS} == c6
.ifndef MASTER_SITES
MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}
MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \
			centos/${LINUX_DIST_VER}/updates/x86_64/Packages/:DEFAULT,amd64 \

			centos/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \
			centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
			centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
.endif
DIST_SUBDIR?=		centos
.elif ${linux_ARGS} == c7
.ifndef MASTER_SITES
MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}
MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \
			centos/${LINUX_DIST_VER}/updates/x86_64/Packages/:DEFAULT,amd64 \

			altarch/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \
			centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
			centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
.endif
DIST_SUBDIR?=		centos
.endif # ${linux_ARGS} == *
.endif	# !MASTER_SITES

PKGNAMEPREFIX?=		linux-${linux_ARGS}-
EXTRACT_SUFX?=		.rpm

Return to bug 224341

Lines 175-182 Link Here

(-)Mk/Uses/linux.mk (-4 / +2 lines)
175		175
176	DISTVERSIONSUFFIX?= -${RPMVERSION}	176	DISTVERSIONSUFFIX?= -${RPMVERSION}
177		177
		178	.ifndef MASTER_SITES
178	.if ${linux_ARGS} == c6	179	.if ${linux_ARGS} == c6
179	.ifndef MASTER_SITES
180	MASTER_SITES= ${MASTER_SITE_CENTOS_LINUX}	180	MASTER_SITES= ${MASTER_SITE_CENTOS_LINUX}
181	MASTER_SITE_SUBDIR= centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \	181	MASTER_SITE_SUBDIR= centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \
182	centos/${LINUX_DIST_VER}/updates/x86_64/Packages/:DEFAULT,amd64 \	182	centos/${LINUX_DIST_VER}/updates/x86_64/Packages/:DEFAULT,amd64 \
Lines 184-193 Link Here
184	centos/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \	184	centos/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \
185	centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \	185	centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
186	centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE	186	centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
187	.endif
188	DIST_SUBDIR?= centos	187	DIST_SUBDIR?= centos
189	.elif ${linux_ARGS} == c7	188	.elif ${linux_ARGS} == c7
190	.ifndef MASTER_SITES
191	MASTER_SITES= ${MASTER_SITE_CENTOS_LINUX}	189	MASTER_SITES= ${MASTER_SITE_CENTOS_LINUX}
192	MASTER_SITE_SUBDIR= centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \	190	MASTER_SITE_SUBDIR= centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \
193	centos/${LINUX_DIST_VER}/updates/x86_64/Packages/:DEFAULT,amd64 \	191	centos/${LINUX_DIST_VER}/updates/x86_64/Packages/:DEFAULT,amd64 \
Lines 195-203 Link Here
195	altarch/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \	193	altarch/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \
196	centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \	194	centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
197	centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE	195	centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
198	.endif
199	DIST_SUBDIR?= centos	196	DIST_SUBDIR?= centos
200	.endif # ${linux_ARGS} == *	197	.endif # ${linux_ARGS} == *
		198	.endif # !MASTER_SITES
201		199
202	PKGNAMEPREFIX?= linux-${linux_ARGS}-	200	PKGNAMEPREFIX?= linux-${linux_ARGS}-
203	EXTRACT_SUFX?= .rpm	201	EXTRACT_SUFX?= .rpm