From da038eb9ee5c737511a8b8dee2f67db6c17fd448 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Tue, 21 Nov 2000 07:38:23 +0000 Subject: The info package seems to be sensitive about the locale settings and fails to install if the language is not C. Override any locale settings when running rpm. PR: 16621 Submitted by: Mikhail Teterin --- emulators/linux_base-6/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'emulators/linux_base-6') diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile index 116b00f09efd..de80d0cac0c6 100644 --- a/emulators/linux_base-6/Makefile +++ b/emulators/linux_base-6/Makefile @@ -96,6 +96,7 @@ RPM_SET3= setserial-2.15-2.${MACHINE_ARCH}.rpm \ xpm-3.4k-1.${MACHINE_ARCH}.rpm DBPATH= /var/lib/rpm +RPM= LC_ALL=C rpm RPMFLAGS= --ignoreos --root ${LINUXBASE} --dbpath ${DBPATH} \ --nodeps --replacepkgs RPMDIR= ${DISTDIR}/${DIST_SUBDIR} @@ -134,7 +135,7 @@ pre-install: do-install: @${MKDIR} ${LINUXBASE}/${DBPATH} @${MKDIR} ${LINUXBASE}/var/tmp - @rpm --initdb --root ${LINUXBASE} --dbpath ${DBPATH} + @${RPM} --initdb --root ${LINUXBASE} --dbpath ${DBPATH} # # Make sure we have a /dev/null in the chrooted environment. # @@ -152,30 +153,30 @@ do-install: # @for R in ${RPM_SET1}; do \ ${ECHO} $$R; \ - rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \ + ${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \ done @${ECHO} ${RPM_LDCONFIG} - @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG} + @${RPM} -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_LDCONFIG} @brandelf -t Linux ${LINUXBASE}/sbin/ldconfig @${LINUXBASE}/sbin/ldconfig @${TOUCH} ${LINUXBASE}/etc/ld.so.conf @for R in ${RPM_SET2}; do \ ${ECHO} $$R; \ - rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \ + ${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \ done @${ECHO} ${RPM_RPM} - @rpm -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM} + @${RPM} -U ${RPMFLAGS} --noscripts ${RPMDIR}/${RPM_RPM} @brandelf -t Linux ${LINUXBASE}/bin/rpm @for R in ${RPM_SET3}; do \ ${ECHO} $$R; \ - rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \ + ${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \ done # # Install updates # @for R in ${PATCHFILES}; do \ ${ECHO} $$R; \ - rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \ + ${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \ done # # Install yp.conf as a hint to NIS users -- cgit v1.2.3