diff options
| author | Treeve Jelbert | 2007-08-08 12:35:11 +0200 |
|---|---|---|
| committer | Eric Sandall | 2007-08-08 22:06:36 -0700 |
| commit | 6f012832013d35780a1b75556046066d93a2c284 (patch) | |
| tree | 763a172590f6b133c18ec63aab7d864c57516097 | |
| parent | 6413b5de22ae252c40fa1518f48f2a7298fd8c54 (diff) | |
util-linux - fix bug #13926
| -rwxr-xr-x | utils/util-linux/BUILD | 6 | ||||
| -rw-r--r-- | utils/util-linux/HISTORY | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | utils/util-linux/PRE_BUILD | 14 | ||||
| -rwxr-xr-x | utils/util-linux/PRE_INSTALL | 7 |
4 files changed, 24 insertions, 10 deletions
diff --git a/utils/util-linux/BUILD b/utils/util-linux/BUILD index 57a5b7d7b6..181809e800 100755 --- a/utils/util-linux/BUILD +++ b/utils/util-linux/BUILD @@ -11,8 +11,4 @@ disable_pic && --mandir=${TRACK_ROOT}/usr/share/man \ --infodir=${TRACK_ROOT}/usr/share/info \ $OPTS && -make && - -if spell_ok util-linux-crypto - then dispel --nosustain util-linux-crypto -fi +make diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY index 63ee71e3aa..686789ab3d 100644 --- a/utils/util-linux/HISTORY +++ b/utils/util-linux/HISTORY @@ -1,3 +1,10 @@ +2007-08-08 Treeve Jelbert <treeve@sourcemage.org> + * PRE_BUILD: add some && + make it EXECUTABLE + don't patch util-linux-ng or do sedits + * BUILD: remove reference to non-existent util-linux-crypto + * PRE_INSTALL: added, fixes bug #13926 + 2007-07-23 David Brown <dmlb2000@gmail.com> * DETAILS: added util-linux-ng testing options and fixed url * PREPARE: question for choosing util-linux-ng diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD index 56c11b7be0..f737d99861 100644..100755 --- a/utils/util-linux/PRE_BUILD +++ b/utils/util-linux/PRE_BUILD @@ -1,9 +1,11 @@ -default_pre_build && cd $SOURCE_DIRECTORY - -patch -p1 < $SCRIPT_DIRECTORY/util-linux-2.12p-cramfs-1.patch -patch -p1 < $SCRIPT_DIRECTORY/glibc-fix.patch -patch -p1 < $SCRIPT_DIRECTORY/glibc-umount2.patch +default_pre_build && +cd $SOURCE_DIRECTORY && +if [[ $UTIL_LINUX_NG == n ]] +then +patch -p1 < $SCRIPT_DIRECTORY/util-linux-2.12p-cramfs-1.patch && +patch -p1 < $SCRIPT_DIRECTORY/glibc-fix.patch && +patch -p1 < $SCRIPT_DIRECTORY/glibc-umount2.patch && sedit "s/HAVE_SLN=no/HAVE_SLN=yes/" MCONFIG && sedit "s/# ADD_RAW=yes/ADD_RAW=yes/" MCONFIG && sedit "s/\$(OPT)//" MCONFIG && @@ -27,3 +29,5 @@ if [ "$SELINUX" == "y" ]; then sedit "s/HAVE_SELINUX=no/HAVE_SELINUX=yes/" MCONFIG && message "${MESSAGE_COLOR} SELINUX is enabled ${DEFAULT_COLOR}" fi + +fi diff --git a/utils/util-linux/PRE_INSTALL b/utils/util-linux/PRE_INSTALL new file mode 100755 index 0000000000..5c93818a42 --- /dev/null +++ b/utils/util-linux/PRE_INSTALL @@ -0,0 +1,7 @@ +# ensure that mount is available for staged install +local SVMNT && +SVMNT-$SOURCE_DIRECTORY/old.bin && +mkdir -p $SVMNT && +cp /bin/mount /bin/umount $SVMNT && +PATH=$PATH:$SVMNT && +default_pre_install |