morpheus

commit 025702eaa4b6cb0fdc783fcc8902dcce814cffc2
parent ac90eb3aa3e52037f89b071be0ba44ef8660123e
Author: Daniel Bainton <dpb@driftaway.org>
Date:   Sun,  9 Mar 2014 14:08:15 +0200

Move pkg specific stuff from stuff to the pkgdir

Diffstat:
M
pkgs/busybox/build
 | 
2
+-
R
stuff/busybox.config -> pkgs/busybox/busybox.config
 | 
0

M
pkgs/extlinux/build
 | 
2
+-
R
stuff/extlinux.conf -> pkgs/extlinux/extlinux.conf
 | 
0

M
pkgs/kernel/build
 | 
2
+-
R
stuff/kernel-config-i486 -> pkgs/kernel/kernel-config-i486
 | 
0

R
stuff/kernel-config-x86_64 -> pkgs/kernel/kernel-config-x86_64
 | 
0

M
pkgs/ncurses/build
 | 
2
+-
R
stuff/ncurses-fallback.c -> pkgs/ncurses/ncurses-fallback.c
 | 
0

R
stuff/0002-remove-unused-code.patch -> pkgs/quark/0002-remove-unused-code.patch
 | 
0

R
stuff/0003-implement-http-not-modified.patch -> pkgs/quark/0003-implement-http-not-modified.patch
 | 
0

M
pkgs/quark/build
 | 
4
++--
M
pkgs/tinywm/build
 | 
4
++--
R
stuff/tinywm.c -> pkgs/tinywm/tinywm.c
 | 
0

M
pkgs/xsetroot/build
 | 
4
++--
R
stuff/xsetroot.c -> pkgs/xsetroot/xsetroot.c
 | 
0

16 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkgs/busybox/build b/pkgs/busybox/build
@@ -3,7 +3,7 @@ url="$mirror/busybox-$v.tar.bz2"
 
 build: crossmusl sbase
 	cd src/busybox-$v
-	cp $top/stuff/busybox.config .config
+	cp $pkgdir/busybox.config .config
 	make -j$nprocs HOSTCC="$CC -static" CC=$CC busybox
 	cp busybox "$root/bin"
 	cd "$root/bin"
diff --git a/stuff/busybox.config b/pkgs/busybox/busybox.config
diff --git a/pkgs/extlinux/build b/pkgs/extlinux/build
@@ -1,2 +1,2 @@
 build: prepare_root
-	cp "$top/stuff/extlinux.conf" "$root/boot"
+	cp "$pkgdir/extlinux.conf" "$root/boot"
diff --git a/stuff/extlinux.conf b/pkgs/extlinux/extlinux.conf
diff --git a/pkgs/kernel/build b/pkgs/kernel/build
@@ -3,7 +3,7 @@ url="$mirror/kernel.tar.gz"
 
 build: crossmusl
 	cd src/linux-$v
-	cp "$top/stuff/kernel-config-$arch" .config
+	cp "$pkgdir/kernel-config-$arch" .config
 	case "$arch" in
 	x86_64)
 		A=x86_64
diff --git a/stuff/kernel-config-i486 b/pkgs/kernel/kernel-config-i486
diff --git a/stuff/kernel-config-x86_64 b/pkgs/kernel/kernel-config-x86_64
diff --git a/pkgs/ncurses/build b/pkgs/ncurses/build
@@ -3,7 +3,7 @@ url="$mirror/ncurses.tar.gz"
 
 build: crossmusl
 	cd src/ncurses-$v
-	cp $top/stuff/ncurses-fallback.c ncurses/fallback.c
+	cp $pkgdir/ncurses-fallback.c ncurses/fallback.c
 	CC="$CC -static" ./configure --prefix="$libcroot" --mandir="$root/share" \
 		--datadir="$root/share" --without-tests \
 		--with-normal --enable-sigwinch --disable-nls --without-dlsym \
diff --git a/stuff/ncurses-fallback.c b/pkgs/ncurses/ncurses-fallback.c
diff --git a/stuff/0002-remove-unused-code.patch b/pkgs/quark/0002-remove-unused-code.patch
diff --git a/stuff/0003-implement-http-not-modified.patch b/pkgs/quark/0003-implement-http-not-modified.patch
diff --git a/pkgs/quark/build b/pkgs/quark/build
@@ -3,8 +3,8 @@ git="git://git.suckless.org/quark"
 build: crossmusl
 	set -x
 	cd src/quark
-	git am -3 "$top/stuff/0002-remove-unused-code.patch"
-	git am -3 "$top/stuff/0003-implement-http-not-modified.patch"
+	git am -3 "$pkgdir/0002-remove-unused-code.patch"
+	git am -3 "$pkgdir/0003-implement-http-not-modified.patch"
 	cp config.def.h config.h
 	$CC -o quark quark.c -DVERSION=\"0.1\" $CFLAGS $LDFLAGS
 	cp quark "$root/bin"
diff --git a/pkgs/tinywm/build b/pkgs/tinywm/build
@@ -1,5 +1,5 @@
 build: tinyxlib
 	set -x
-	cd stuff
-	$CC tinywm.c -o tinywm -lX11 $CFLAGS $LDFLAGS
+	cd src
+	$CC $pkgdir/tinywm.c -o tinywm -lX11 $CFLAGS $LDFLAGS
 	cp tinywm "$root/bin"
diff --git a/stuff/tinywm.c b/pkgs/tinywm/tinywm.c
diff --git a/pkgs/xsetroot/build b/pkgs/xsetroot/build
@@ -1,5 +1,5 @@
 build: tinyxlib
 	set -x
-	cd stuff
-	$CC xsetroot.c -o xsetroot -lX11 $CFLAGS $LDFLAGS
+	cd src
+	$CC $pkgdir/xsetroot.c -o xsetroot -lX11 $CFLAGS $LDFLAGS
 	cp xsetroot "$root/bin"
diff --git a/stuff/xsetroot.c b/pkgs/xsetroot/xsetroot.c