diff options
| author | Jaka Kranjc | 2007-01-19 10:45:30 +0100 |
|---|---|---|
| committer | Jaka Kranjc | 2007-01-19 10:47:12 +0100 |
| commit | ab1e7a858c491a93147b43233ff262f517ce858d (patch) | |
| tree | 1a534766820bbeee841fa8918c274570ee0ba97b | |
| parent | 09c64110e20e27da1b5bb253553ea7f199504607 (diff) | |
Fix coreutils again, now with patch order.
I didn't encounter this on my testing last week, now I got hostname.diff failing after the autoreconf from PAM - has it been there back then?
Now applying all other patches before the PAM stuff.
Conflicts:
utils/coreutils/PRE_BUILD
also disabling the EPERM patch as per the bug
| -rw-r--r-- | utils/coreutils/HISTORY | 3 | ||||
| -rwxr-xr-x | utils/coreutils/PRE_BUILD | 13 |
2 files changed, 10 insertions, 6 deletions
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY index 9d63abd67e..713bc4f546 100644 --- a/utils/coreutils/HISTORY +++ b/utils/coreutils/HISTORY @@ -1,3 +1,6 @@ +2007-01-18 Thomas Orgis <sobukus@sourcemage.org> + * PRE_BUILD: do PAM patch and autoreconf _after_ all other patches + 2007-01-14 Thomas Orgis <sobukus@sourcemage.org> * DEPENDS: depend on autoconf if PAM is enabled * BUILD, PRE_BUILD: fixed the PAM fix, regenerating configure diff --git a/utils/coreutils/PRE_BUILD b/utils/coreutils/PRE_BUILD index d4e463c4a6..45261717ed 100755 --- a/utils/coreutils/PRE_BUILD +++ b/utils/coreutils/PRE_BUILD @@ -1,6 +1,12 @@ default_pre_build && cd $SOURCE_DIRECTORY && #patch -p1 < $SCRIPT_DIRECTORY/coreutils-cp-mv-oMFS-bug.patch && + +# +# Don't install coreutils' hostname (Bug #7089) +# +patch -p1 < $SCRIPT_DIRECTORY/hostname.diff && + # # patch for pam support in su # @@ -8,9 +14,4 @@ if echo $OPTS | grep -q enable-pam; then message "${MESSAGE_COLOR} linux-pam is enabled ${DEFAULT_COLOR}" && patch -p1 < $SCRIPT_DIRECTORY/coreutils-pam.patch && autoreconf --force # make sure to give clear situation with automake-1.9 -fi && - -# -# Don't install coreutils' hostname (Bug #7089) -# -patch -p1 < $SCRIPT_DIRECTORY/hostname.diff +fi |