'[FreeWRT-commits] r3818 - trunk/freewrt/mk'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freewrt-commits
Subject:    [FreeWRT-commits] r3818 - trunk/freewrt/mk
From:       tg () freewrt ! org
Date:       2008-10-29 18:10:40
Message-ID: 20081029181040.4EC221C00D () frozenfish ! freewrt ! org
[Download RAW message or body]

Author: tg
Date: 2008-10-29 19:10:40 +0100 (Wed, 29 Oct 2008)
New Revision: 3818

Modified:
   trunk/freewrt/mk/buildhlp.mk
   trunk/freewrt/mk/fetch.mk
   trunk/freewrt/mk/kernel-build.mk
   trunk/freewrt/mk/package.mk
   trunk/freewrt/mk/pkg-bottom.mk
   trunk/freewrt/mk/vars.mk
Log:
prefix paxmirabilis tools, WFM


Modified: trunk/freewrt/mk/buildhlp.mk
===================================================================
--- trunk/freewrt/mk/buildhlp.mk	2008-10-29 18:05:03 UTC (rev 3817)
+++ trunk/freewrt/mk/buildhlp.mk	2008-10-29 18:10:40 UTC (rev 3818)
@@ -66,7 +66,7 @@
 ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done
 	[ ! -d ./patches ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \
 	    '{patch-!(*.orig),*.patch}'
-	[ ! -d ./extra ] || (cd extra; $(PREVENT_PATCH) pax -rw . ${WRKDIST}/)
+	[ ! -d ./extra ] || (cd extra; $(PREVENT_PATCH) mirpax -rw . ${WRKDIST}/)
 	@${MAKE} post-patch
 	touch $@
 endif

Modified: trunk/freewrt/mk/fetch.mk
===================================================================
--- trunk/freewrt/mk/fetch.mk	2008-10-29 18:05:03 UTC (rev 3817)
+++ trunk/freewrt/mk/fetch.mk	2008-10-29 18:10:40 UTC (rev 3818)
@@ -66,8 +66,8 @@
 	i='$${LOCAL_DISTDIR}'; \
 	if [[ -n $$$$i && -e $$$$i/$$$$subname ]]; then \
 		cd "$$$$i"; \
-		echo pax -rw "$$$$subname" '$${DISTDIR}/'; \
-		exec pax -rw "$$$$subname" '$${DISTDIR}/'; \
+		echo mirpax -rw "$$$$subname" '$${DISTDIR}/'; \
+		exec mirpax -rw "$$$$subname" '$${DISTDIR}/'; \
 	fi; \
 	mkdir -p "$$$${fullname%%/$$$$filename}"; \
 	cd "$$$${fullname%%/$$$$filename}"; \

Modified: trunk/freewrt/mk/kernel-build.mk
===================================================================
--- trunk/freewrt/mk/kernel-build.mk	2008-10-29 18:05:03 UTC (rev 3817)
+++ trunk/freewrt/mk/kernel-build.mk	2008-10-29 18:10:40 UTC (rev 3818)
@@ -33,7 +33,7 @@
 	rm -f $(BUILD_DIR)/linux
 	ln -s $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux
 	$(TRACE) target/linux/$(BOARD)-$(KERNEL)-kernel-patch
-	-[[ -d extra ]] && cd extra && pax -rw . ${LINUX_DIR}/
+	-[[ -d extra ]] && cd extra && mirpax -rw . ${LINUX_DIR}/
 	-[ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) \
                ../generic-$(KERNEL)/patches $(MAKE_TRACE)
 	-[ -d ../generic-${UNAME_R}/patches ] && $(PATCH) $(LINUX_DIR) \
                ../generic-${UNAME_R}/patches $(MAKE_TRACE)
 	-[ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE)
@@ -119,7 +119,7 @@
 	env GCC_HONOUR_COPTS=s $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)
 	$(TRACE) target/linux/$(BOARD)-$(KERNEL)-modules-install
 	rm -rf ${LINUX_BUILD_DIR}/root*
-	cd ${BUILD_DIR} && pax -rw -pe root ${LINUX_BUILD_DIR}/
+	cd ${BUILD_DIR} && mirpax -rw -pe root ${LINUX_BUILD_DIR}/
 	printf '%s\n%s\n' 'dest root /' \
 	    'option offline_root $(LINUX_BUILD_DIR)/root' \
 	    >$(LINUX_BUILD_DIR)/ipkg.conf
@@ -130,7 +130,7 @@
 noinstall: compile
 	env GCC_HONOUR_COPTS=s $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)
 	rm -rf ${LINUX_BUILD_DIR}/root*
-	cd ${BUILD_DIR} && pax -rw -pe root ${LINUX_BUILD_DIR}/
+	cd ${BUILD_DIR} && mirpax -rw -pe root ${LINUX_BUILD_DIR}/
 	printf '%s\n%s\n' 'dest root /' \
 	    'option offline_root $(LINUX_BUILD_DIR)/root' \
 	    >$(LINUX_BUILD_DIR)/ipkg.conf

Modified: trunk/freewrt/mk/package.mk
===================================================================
--- trunk/freewrt/mk/package.mk	2008-10-29 18:05:03 UTC (rev 3817)
+++ trunk/freewrt/mk/package.mk	2008-10-29 18:10:40 UTC (rev 3818)
@@ -153,7 +153,7 @@
 	    find usr ! -type d 2>/dev/null | \
 	    grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \
 	    tee '$${STAGING_PARENT}/pkg/$(1)' | \
-	    cpio -apdlmu '$${STAGING_DIR}'
+	    mircpio -apdlmu '$${STAGING_DIR}'
 	@cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \
 	    '$${STAGING_PARENT}/pkg/$(1)' | while read fn; do \
 		chmod u+w $$$$fn; \

Modified: trunk/freewrt/mk/pkg-bottom.mk
===================================================================
--- trunk/freewrt/mk/pkg-bottom.mk	2008-10-29 18:05:03 UTC (rev 3817)
+++ trunk/freewrt/mk/pkg-bottom.mk	2008-10-29 18:10:40 UTC (rev 3818)
@@ -118,7 +118,7 @@
 endif
 ifneq ($(strip ${FWRT_PACKAGE_FWWIF}),)
 ifneq ($(filter fwwif,${BUILD_STYLE}),)
-	pax -rw fwwif ${WRKDIR}/
+	mirpax -rw fwwif ${WRKDIR}/
 	cd ${WRKDIR}/fwwif && env ${MAKE_ENV} ${BSDMAKE} MODULE=${PKG_NAME} \
 	    XARCH=${ARCH} CROSSROOT=${TOPDIR}/cross_${ARCH} ${MAKE_FLAGS} all
 endif
@@ -181,7 +181,7 @@
 	    find usr ! -type d 2>/dev/null | \
 	    grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \
 	    tee '${STAGING_PARENT}/pkg/${PKG_NAME}' | \
-	    cpio -apdlmu '${STAGING_DIR}'
+	    mircpio -apdlmu '${STAGING_DIR}'
 	@cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \
 	    '${STAGING_PARENT}/pkg/${PKG_NAME}' | while read fn; do \
 		chmod u+w $$fn; \
@@ -246,7 +246,7 @@
 		li=$$inode; \
 	done
 ifeq (${FWRT_MANPAGES},y)
-	cd ${WRKDIR}/wman; pax -rw htman ${BIN_DIR}/
+	cd ${WRKDIR}/wman; mirpax -rw htman ${BIN_DIR}/
 endif
 	touch ${_IPKGS_COOKIE}
 

Modified: trunk/freewrt/mk/vars.mk
===================================================================
--- trunk/freewrt/mk/vars.mk	2008-10-29 18:05:03 UTC (rev 3817)
+++ trunk/freewrt/mk/vars.mk	2008-10-29 18:10:40 UTC (rev 3818)
@@ -8,7 +8,7 @@
 # I'll use 'svn blame' and get to you personally ;-)
 
 CP=			cp -fpR
-PCP=			pax -v -rw -pe
+PCP=			mirpax -v -rw -pe
 INSTALL_DIR=		install -d -m0755
 INSTALL_DATA=		install -m0644
 INSTALL_BIN=		install -m0755
@@ -97,12 +97,12 @@
 			cd ${WRKDIR} && \
 			for file in ${FULLDISTFILES}; do case $$file in \
 			*.cpio | *.tar) \
-				pax -r -s '!/\.$$!!' <$$file ;; \
+				mirpax -r -s '!/\.$$!!' <$$file ;; \
 			*.cpio.Z | *.cpio.gz | *.cgz | *.mcz | \
 			    *.tar.Z | *.tar.gz | *.taz | *.tgz) \
-				gzip -dc $$file | pax -r -s '!/\.$$!!' ;; \
+				gzip -dc $$file | mirpax -r -s '!/\.$$!!' ;; \
 			*.cpio.bz2 | *.cbz | *.tar.bz2 | *.tbz | *.tbz2) \
-				bzip2 -dc $$file | pax -r -s '!/\.$$!!' ;; \
+				bzip2 -dc $$file | mirpax -r -s '!/\.$$!!' ;; \
 			*.zip) \
 				unzip -d ${WRKDIR} $$file ;; \
 			*) \

_______________________________________________
freewrt-commits mailing list
freewrt-commits@freewrt.org
https://www.freewrt.org/lists/listinfo/freewrt-commits


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic