X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fuml%2Fimage%2FMakefile;h=c8ed874d151d38a03e68b7d4a8b127649c64bf05;hb=e8c3b9897363641614bcb461b6ca704b95422da6;hp=baf945f5073ab76a7f3c526e8cbc4b3df8361fc0;hpb=0946764732b8d2059621bff372150ca074e972c4;p=lede-git%2F.git

diff --git a/target/linux/uml/image/Makefile b/target/linux/uml/image/Makefile
index baf945f507..c8ed874d15 100644
--- a/target/linux/uml/image/Makefile
+++ b/target/linux/uml/image/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,9 +11,25 @@ define Image/Prepare
 	cp $(LINUX_DIR)/linux $(KDIR)/vmlinux.elf
 endef
 
+define Image/Build/squashfs
+	dd if=/dev/zero of=$(KDIR)/root.squashfs bs=1024k count=0 seek=$(CONFIG_TARGET_ROOTFS_PARTSIZE)
+endef
+
 define Image/Build
-	cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).img
-	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux
+	$(call Image/Build/$(1))
+	cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1).img
+	cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux
 endef
 
 $(eval $(call BuildImage))
+
+# UML requires linking against several glibc static libraries: libutil, librt
+# and libpthread, check that here. We do not check against libpthread
+# specifically because getting something to build that references a libpthread
+# symbol is pretty involved and Linux distributions package these 3 libraries
+# in the same package.
+
+$(eval $(call TestHostCommand,glibc-static, \
+	Please install a static glibc package. (Missing libutil.a, librt.a or libpthread.a), \
+	echo 'int main(int argc, char **argv) { login(0); timer_gettime(0, 0); return 0; }' | \
+		gcc -include utmp.h -x c -o $(TMP_DIR)/a.out - -static -lutil -lrt))