Changeset e18f80a

Timestamp:

11/06/2013 08:55:27 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

b2c7742

Parents:

2982825

Message:

Fix BLFS tool inclusion for CLFS:
-fix a typo in Makefile (8 spaces to tab...)
-fix permission problems (hopefully)

Files:

• CLFS/master.sh (modified) (2 diffs)
• common/libs/func_install_blfs (modified) (1 diff)

CLFS/master.sh

@@ -70 +70 @@
         echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc
         @chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\
+        chmod a+wt \$(MOUNT_PT) && \\
         touch envars && \\
-        chmod -R a+wt \$(MOUNT_PT) && \\
-        chown -R \$(LUSER) \$(MOUNT_PT)/\$(SCRIPT_ROOT)
+        chown \$(LUSER):\$(LGROUP) envars
         @\$(call housekeeping)
 EOF
@@ -1057 +1057 @@
 
 mk_BLFS_TOOL: mk_FINAL
-        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-          \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
-          ( make -C $BLFS_ROOT/work ); \\
-        fi;
-        @touch \$@
+        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+          \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
+          ( make -C $BLFS_ROOT/work ); \\
+        fi;
+        @touch \$@
 
 mk_CUSTOM_TOOLS: mk_BLFS_TOOL

common/libs/func_install_blfs

@@ -32 +32 @@
 sudo make -j1 -C $BUILDDIR$BLFS_ROOT TRACKING_DIR=$BUILDDIR$TRACKING_DIR \
     $BUILDDIR$BLFS_ROOT/packages.xml
+
+# Now /var and /var/lib are owned by root. This is an issue when building
+# CLFS with method=boot, because system dirs creation is made by user, who
+# then cannot create /var/lock and the such.
+sudo chown -R $LUSER $BUILDDIR/var
 
 # Because the BLFS Makefile is supposed to be used in chroot (or booted)