From: mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 8 Sep 2010 10:06:51 +0000 (+0000)
Subject: psfreedom: update
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;ds=sidebyside;h=d818108c3373d7718e7e260bf4376cfd5ed396a4;p=packages.git

psfreedom: update


git-svn-id: svn://svn.openwrt.org/openwrt/packages@22984 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/utils/psfreedom/Makefile b/utils/psfreedom/Makefile
index 790b4e9c2..59139aaf9 100644
--- a/utils/psfreedom/Makefile
+++ b/utils/psfreedom/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=psfreedom
-PKG_REV:=d62f4aedf33c1ad5222a8c970e623da5441c40db
+PKG_REV:=1998b60b81ddd6400cdf208d71a7878a7021a078
 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 
@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/psfreedom
   SUBMENU:=USB Support
-  DEPENDS:=@TARGET_omap24xx +kmod-usb-tahvo +kmod-musb-hdrc
+  DEPENDS:=@TARGET_omap24xx +TARGET_omap24xx:kmod-usb-tahvo +TARGET_omap24xx:kmod-musb-hdrc
   TITLE:=PSFreedom PS3 USB exploit
   FILES:=$(PKG_BUILD_DIR)/psfreedom.ko
 endef
@@ -34,29 +34,20 @@ endef
 
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
+TARGET_CFG_CFLAGS:=$(if $(CONFIG_TARGET_omap24xx),-DENABLE_MUSB_CONTROLLER)
+
 define Build/Compile
 	$(MAKE) $(KERNEL_MAKEOPTS) \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		KDIR="$(LINUX_DIR)" \
 		PWD="$(PKG_BUILD_DIR)" \
-		EXTRA_CFLAGS="-DENABLE_MUSB_CONTROLLER" \
+		EXTRA_CFLAGS="$(TARGET_CFG_CFLAGS)" \
 		modules
 endef
 
 define KernelPackage/psfreedom/install
-	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/payload_bdemu.bin \
-		$(1)/lib/firmware/psfreedom_payload_bdemu.bin
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/payload_no_bdemu.bin \
-		$(1)/lib/firmware/psfreedom_payload_no_bdemu.bin
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/shellcode_exec_payload.bin \
-		$(1)/lib/firmware/psfreedom_shellcode_exec_payload.bin
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/shellcode_panic.bin \
-		$(1)/lib/firmware/psfreedom_shellcode_panic.bin
-	( cd $(1)/lib/firmware; \
-		$(LN) psfreedom_payload_bdemu.bin psfreedom_payload.bin; \
-		$(LN) psfreedom_shellcode_exec_payload.bin psfreedom_shellcode.bin; \
-	)
+	$(INSTALL_DIR) $(1)/usr/share/psfreedom/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/bins/*.bin $(1)/usr/share/psfreedom/
 endef
 
 $(eval $(call KernelPackage,psfreedom))