Opened 3 years ago

Closed 3 years ago

Last modified 3 years ago

#15223 closed task (fixed)

usr-merge adjustments

Reported by: Douglas R. Reno Owned by: blfs-book
Priority: normal Milestone: 11.0
Component: BOOK Version: git
Severity: normal Keywords:
Cc:

Description (last modified by thomas)

During the day on 6/26/2021, Joe Locash reported a series of changes needed due to merged-/usr changes.

These changes include:

autofs

For the /usr merge:
  Change --prefix=/ to -- prefix=/usr when running configure

fixed at [89265b09]

gptfdisk

For the /usr merge:
 After applying the convenience patch
  sed -i 's|sbin|usr/sbin|' Makefile

  Since the BLFS convenience patch adds the install target to the Makefile it's probably better to fix the patch.

fixed at a740c954f0c04aa4cb5c5e4bf0b4ff5d55c34ff8

hdparm

For the /usr merge:
  Change make install to make binprefix=/usr install

fixed at c3d04c0f4976339e4063875f68ac1c7647e0a305

keyutils

For the /usr merge:
  When installing use:
    make NO_ARLIB=1 LIBDIR=/usr/lib BINDIR=/usr/bin SBINDIR=/usr/shin install

fixed at cedbfaa777de6b3822deedafa6277763f8b1d8be

mdadm

For the /usr merge:
  Change make install to make BINDIR=/usr/shin install

Fixed in [0ea195f4]

net-tools-CVS_20101030

For the /usr merge:
  Change make update to make BASEDIR=/usr update

Fixed in [0ea195f4]. The usage of BASEDIR does not work as it is treated just like DESTDIR and so it would produce /usr/usr/share/man... objects.

ntfs-3g-2017.3.23

(Chopped the sed out of the thread)

Sorry about that all, forgot to include my sed:
  sed -i 's|/sbin|$(rootsbindir)|' {ntfsprogs,src}/Makefile.in

Why fix a hard coded path with another?

fixed at a740c954f0c04aa4cb5c5e4bf0b4ff5d55c34ff8

Change History (9)

comment:1 by Douglas R. Reno, 3 years ago

I forgot stunnel:

For the /usr merge:
  The service file gets installed in /lib/systemd/system should be /usr/lib/systemd/system

Fixed in [6a054305]

Last edited 3 years ago by thomas (previous) (diff)

comment:2 by thomas, 3 years ago

shadow:

For the /usr merge: Add --bindir=/usr/bin --sbindir=/usr/sbin to configure

that is to be updated in LFS, too

not required, exec_prefix=/usr in make install does the trick

Last edited 3 years ago by thomas (previous) (diff)

comment:3 by thomas, 3 years ago

Description: modified (diff)

comment:4 by Douglas R. Reno, 3 years ago

Description: modified (diff)

hdparm has been fixed at c3d04c0f4976339e4063875f68ac1c7647e0a305

comment:5 by Douglas R. Reno, 3 years ago

Description: modified (diff)

Keyutils has been fixed at cedbfaa777de6b3822deedafa6277763f8b1d8be

comment:6 by Douglas R. Reno, 3 years ago

Description: modified (diff)

gptfdisk and ntfs-3g have been fixed at a740c954f0c04aa4cb5c5e4bf0b4ff5d55c34ff8

comment:7 by thomas, 3 years ago

Description: modified (diff)

comment:8 by thomas, 3 years ago

Resolution: fixed
Status: newclosed

All packages handled - closing for now

comment:9 by Bruce Dubbs, 3 years ago

Milestone: 10.211.0

Milestone renamed

Note: See TracTickets for help on using tickets.