Inicio Explorar Axuda
Rexistro Iniciar sesión
PUBLIC_REPOS
/
buildroot
réplica de git://git.buildroot.net/buildroot
2
1
Fork 0
Ficheiros
Explorar o código

Revert "system: Fix warning when selecting systemd"

This reverts commit b4718c3a28fc3b178253b24bd6fbb8540a724c7e.

The BR2_ROOTFS_MERGED_USR symbol is used to activate various workarounds for
a merged /usr by packages, so it should be active even with a custom rootfs
skeleton.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Peter Korsgaard %!s(int64=9) %!d(string=hai) anos
pai
54fde89493
achega
adcc48e0b2
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 1 1
      system/Config.in

+ 1 - 1
system/Config.in
Ver ficheiro 

@@ -92,7 +92,7 @@ config BR2_INIT_SYSTEMD
 
 	depends on BR2_USE_MMU
 
 	depends on BR2_USE_MMU
 
 	depends on !BR2_STATIC_LIBS
 
 	depends on !BR2_STATIC_LIBS
 
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
 
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
 
-	select BR2_ROOTFS_MERGED_USR if BR2_ROOTFS_SKELETON_DEFAULT
 
+	select BR2_ROOTFS_MERGED_USR
 
 	select BR2_PACKAGE_SYSTEMD
 
 	select BR2_PACKAGE_SYSTEMD
 
 
 
 comment "systemd needs (e)glibc toolchain, headers >= 3.10"
 
 comment "systemd needs (e)glibc toolchain, headers >= 3.10"