Changeset aee909e in freewrt for package

Timestamp:

Jul 25, 2006, 3:09:10 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

86ea442

Parents:

24dce9d

Message:

allow automatic copy of a hierarchy rooted in extra/
into ${WRKSRC} (and prevent these from being included
in patches)

agreed wbx@ on the phone

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@407 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/rules.mk (modified) (2 diffs)

package/rules.mk

@@ -60 +60 @@
         rm -rf ${WRKSRC} ${WRKBUILD}
         ${EXTRACT_CMD}
-        [ ! -d ./patches ] || $(PATCH) $(WRKSRC) ./patches
+        [ ! -d ./patches ] || $(PREVENT_PATCH) $(PATCH) $(WRKSRC) ./patches
+        [ ! -d ./extra ] || (cd extra; $(PREVENT_PATCH) pax -rw . ${WRKSRC}/)
         touch $(WRKBUILD)/.prepared
 endif
@@ -104 +105 @@
         @test ! -d ${WRKDIR}.orig || rm -rf ${WRKDIR}.orig
         @test ! -d ${WRKDIR}.orig
-        @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PATCH=:
-        @toedit=$$(WRKDIST='${WRKSRC}' PATCHDIR=$$(pwd)/patches \
+        @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=:
+        @toedit=$$(WRKDIST='${WRKSRC}' CURDIR=$$(pwd) \
             PATCH_LIST='patch-* *.patch' WRKDIR1='${WRKDIR}' \
             ${BASH} ${TOPDIR}/scripts/update-patches); \