r3488 - jhalfs/branches/experimental/common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Tue Sep 25 11:06:33 PDT 2007


Author: manuel
Date: 2007-09-25 12:06:33 -0600 (Tue, 25 Sep 2007)
New Revision: 3488

Modified:
   jhalfs/branches/experimental/common/makefile-functions
Log:
Revising makefile-functions

Modified: jhalfs/branches/experimental/common/makefile-functions
===================================================================
--- jhalfs/branches/experimental/common/makefile-functions	2007-09-25 17:50:20 UTC (rev 3487)
+++ jhalfs/branches/experimental/common/makefile-functions	2007-09-25 18:06:33 UTC (rev 3488)
@@ -56,67 +56,22 @@
   @echo $(BOLD)$(1) target $(BLUE)$@$(BOLD)$(WHITE)
 endef
 
-#=======================
-
-
-#=== BUILD FUNCTIONS ===
-
-define remove_existing_dirs
-  @PKG_PATH=`ls -t $(SRCSDIR)/$(1) | head -n1` && \
-  ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \
-  [ -n "$$ROOT" ] && \
-  if [ -d $(SRCDIR)/$$ROOT ]; then \
-    rm -rf $(SRCSDIR)/$$ROOT && \
-    rm -rf $(SRCSDIR)/$${ROOT%-*}-build; \
-  fi;
+define housekeeping
+  @touch  $@ && \
+  sleep .25 && \
+  echo  -e "\n" $(BOLD)Target $(BLUE)$@ $(WHITE)$(BOLD)OK && \
+  echo --------------------------------------------------------------------------------$(WHITE) && \
+  if [ "$(BREAKPOINT)" = "$@" ] ; then \
+     echo $(tab_)$(RED)The build has been stopped at $(BLUE)$@ $(RED)as requested$(WHITE) ; \
+     false ; \
+  fi
 endef
 
-define remove_existing_dirs2
-  @PKG_PATH=`ls -t $(SRC)/$(1) | head -n1` && \
-  ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \
-  [ -n "$$ROOT" ] && \
-  if [ -d $(SRC)/$$ROOT ]; then \
-    rm -rf $(SRC)/$$ROOT && \
-    rm -rf $(SRC)/$${ROOT%-*}-build; \
-  fi;
-endef
+#=======================
 
-#==#
 
-define unpack
-  @cd $(SRCSDIR) && \
-  tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
-endef
+#=== INSTALL_LOG FUNCTIONS ===
 
-define unpack2
-  @cd $(SRC) && \
-  tar -xvf `ls -t $(1) | head -n1` > $(PKG_LST)
-endef
-
-#==#
-
-define get_pkg_root
-  @ROOT=`head -n1 $(SRCSDIR)/$(PKG_LST) | sed 's@^./@@;s@/.*@@'` && \
-  if [ "$(1)" != "nouser" ]; then \
-    echo "export PKGDIR=$(SRCSDIR)/$$ROOT" > envars; \
-    chown -R $(LUSER) $(SRCSDIR)/$$ROOT; \
-  else \
-    echo "export PKGDIR=$(crSRCSDIR)/$$ROOT" > envars; \
-  fi;
-endef
-
-define get_pkg_root2
-  @ROOT=`head -n1 $(SRC)/$(PKG_LST) | sed 's@^./@@;s@/.*@@'` && \
-  echo "export PKGDIR=$(SRC)/$$ROOT" > envars
-endef
-
-define get_pkg_root_LUSER
-  @ROOT=`head -n1 $(SRCSDIR)/$(PKG_LST) | sed 's@^./@@;s@/.*@@'` && \
-  echo "export PKGDIR=$(SRCSDIR)/$$ROOT" > envars
-endef
-
-#==#
-
 define touch_timestamp
   @touch $(SRC)/timestamp-marker && sleep 1
 endef
@@ -137,33 +92,6 @@
   -printf "%p\t%s\t%u:%g\t%m\t%l\n" | sort > $(BASEDIR)$(crFILELOGDIR)/$(1)
 endef
 
-#==@
-
-define remove_build_dirs
-  @ROOT=`head -n1 $(SRCSDIR)/$(PKG_LST) | sed 's@^./@@;s@/.*@@'` && \
-  rm -rf $(SRCSDIR)/$$ROOT && \
-  rm -rf $(SRCSDIR)/$(1)-build
-endef
-
-define remove_build_dirs2
-  @ROOT=`head -n1 $(SRC)/$(PKG_LST) | sed 's@^./@@;s@/.*@@'` && \
-  rm -rf $(SRC)/$$ROOT && \
-  rm -rf $(SRC)/$(1)-build
-endef
-
-#==#
-
-define housekeeping
-  @touch  $@ && \
-  sleep .25 && \
-  echo  -e "\n" $(BOLD)Target $(BLUE)$@ $(WHITE)$(BOLD)OK && \
-  echo --------------------------------------------------------------------------------$(WHITE) && \
-  if [ "$(BREAKPOINT)" = "$@" ] ; then \
-     echo $(tab_)$(RED)The build has been stopped at $(BLUE)$@ $(RED)as requested$(WHITE) ; \
-     false ; \
-  fi
-endef
-
 #=======================
 
 




More information about the alfs-log mailing list