clean up yesterday's reorganization
SVN-Revision: 127
This commit is contained in:
parent
65b1ac7237
commit
d28142a005
5 changed files with 111 additions and 114 deletions
|
@ -40,6 +40,7 @@ BUILD_WITH_LARGEFILE:=true
|
||||||
|
|
||||||
OPTIMIZE_FOR_CPU=$(ARCH)
|
OPTIMIZE_FOR_CPU=$(ARCH)
|
||||||
|
|
||||||
|
# directory used by 'make publish'
|
||||||
PUB_DIR:=/var/www/html/testsite/ipkg
|
PUB_DIR:=/var/www/html/testsite/ipkg
|
||||||
|
|
||||||
# Command used to download source code
|
# Command used to download source code
|
||||||
|
@ -180,7 +181,6 @@ else
|
||||||
DISABLE_NLS:=--disable-nls
|
DISABLE_NLS:=--disable-nls
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
all: world
|
all: world
|
||||||
|
|
||||||
TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
|
TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
|
||||||
|
@ -189,7 +189,7 @@ TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
|
||||||
|
|
||||||
|
|
||||||
PACKAGES_IPK:=$(patsubst %,%-ipk,$(PACKAGES))
|
PACKAGES_IPK:=$(patsubst %,%-ipk,$(PACKAGES))
|
||||||
|
OPENWRT_IPK_DIR=$(SOURCE_DIR)/openwrt/ipkg
|
||||||
|
|
||||||
$(BUILD_DIR)/Packages : $(PACKAGES_IPK)
|
$(BUILD_DIR)/Packages : $(PACKAGES_IPK)
|
||||||
(cd $(BUILD_DIR) ; $(IPKG_MAKE_INDEX) . > Packages)
|
(cd $(BUILD_DIR) ; $(IPKG_MAKE_INDEX) . > Packages)
|
||||||
|
@ -225,9 +225,7 @@ $(STAGING_DIR):
|
||||||
|
|
||||||
$(TARGET_DIR): $(DL_DIR)/$(OPENWRT_ROOT_SKEL)
|
$(TARGET_DIR): $(DL_DIR)/$(OPENWRT_ROOT_SKEL)
|
||||||
rm -rf $(TARGET_DIR)
|
rm -rf $(TARGET_DIR)
|
||||||
#zcat $(SOURCE_DIR)/skel.tar.gz | tar -C $(BUILD_DIR) -xf -
|
|
||||||
zcat $(DL_DIR)/$(OPENWRT_ROOT_SKEL) | tar -C $(BUILD_DIR) -xf -
|
zcat $(DL_DIR)/$(OPENWRT_ROOT_SKEL) | tar -C $(BUILD_DIR) -xf -
|
||||||
#cp -a $(SOURCE_DIR)/target_skeleton/* $(TARGET_DIR)/
|
|
||||||
-find $(TARGET_DIR) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1
|
-find $(TARGET_DIR) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1
|
||||||
|
|
||||||
source: $(TARGETS_SOURCE)
|
source: $(TARGETS_SOURCE)
|
||||||
|
@ -252,7 +250,6 @@ distclean:
|
||||||
openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
|
openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
|
||||||
openwrt-kmodules.tar.bz2
|
openwrt-kmodules.tar.bz2
|
||||||
|
|
||||||
|
|
||||||
publish:
|
publish:
|
||||||
chmod 644 $(BUILD_DIR)/Packages
|
chmod 644 $(BUILD_DIR)/Packages
|
||||||
chmod 644 $(BUILD_DIR)/Packages.filelist
|
chmod 644 $(BUILD_DIR)/Packages.filelist
|
||||||
|
@ -261,8 +258,6 @@ publish:
|
||||||
cp $(BUILD_DIR)/Packages.filelist $(PUB_DIR)
|
cp $(BUILD_DIR)/Packages.filelist $(PUB_DIR)
|
||||||
cp $(BUILD_DIR)/*.ipk $(PUB_DIR)
|
cp $(BUILD_DIR)/*.ipk $(PUB_DIR)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
sourceball:
|
sourceball:
|
||||||
rm -rf $(BUILD_DIR)
|
rm -rf $(BUILD_DIR)
|
||||||
set -e; \
|
set -e; \
|
||||||
|
|
|
@ -7,9 +7,10 @@
|
||||||
OPENSSH_SITE:=ftp://ftp.tux.org/bsd/openbsd/OpenSSH/portable/
|
OPENSSH_SITE:=ftp://ftp.tux.org/bsd/openbsd/OpenSSH/portable/
|
||||||
OPENSSH_DIR:=$(BUILD_DIR)/openssh-3.8p1
|
OPENSSH_DIR:=$(BUILD_DIR)/openssh-3.8p1
|
||||||
OPENSSH_SOURCE:=openssh-3.8p1.tar.gz
|
OPENSSH_SOURCE:=openssh-3.8p1.tar.gz
|
||||||
OPENSSH_PATCH:=$(SOURCE_DIR)/openssh.patch
|
|
||||||
|
|
||||||
OPENSSH_IPK_DIR:=$(BUILD_DIR)/openssh-3.8p1-ipk
|
OPENSSH_IPK_DIR=$(OPENWRT_IPK_DIR)/openssh
|
||||||
|
OPENSSH_IPK_BUILD_DIR:=$(BUILD_DIR)/openssh-3.8p1-ipk
|
||||||
|
|
||||||
OPENSSH_SERVER_IPK:=$(BUILD_DIR)/openssh-server_3.8p1-1_mipsel.ipk
|
OPENSSH_SERVER_IPK:=$(BUILD_DIR)/openssh-server_3.8p1-1_mipsel.ipk
|
||||||
OPENSSH_CLIENT_IPK:=$(BUILD_DIR)/openssh-client_3.8p1-1_mipsel.ipk
|
OPENSSH_CLIENT_IPK:=$(BUILD_DIR)/openssh-client_3.8p1-1_mipsel.ipk
|
||||||
OPENSSH_SFTP_SERVER_IPK:=$(BUILD_DIR)/openssh-sftp-server_3.8p1-1_mipsel.ipk
|
OPENSSH_SFTP_SERVER_IPK:=$(BUILD_DIR)/openssh-sftp-server_3.8p1-1_mipsel.ipk
|
||||||
|
@ -21,7 +22,7 @@ $(DL_DIR)/$(OPENSSH_SOURCE):
|
||||||
|
|
||||||
$(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE) $(OPENSSH_PATCH)
|
$(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE) $(OPENSSH_PATCH)
|
||||||
zcat $(DL_DIR)/$(OPENSSH_SOURCE) | tar -C $(BUILD_DIR) -xvf -
|
zcat $(DL_DIR)/$(OPENSSH_SOURCE) | tar -C $(BUILD_DIR) -xvf -
|
||||||
cat $(OPENSSH_PATCH) | patch -p1 -d $(OPENSSH_DIR)
|
cat $(OPENSSH_IPK_DIR)/openssh.patch | patch -p1 -d $(OPENSSH_DIR)
|
||||||
touch $(OPENSSH_DIR)/.unpacked
|
touch $(OPENSSH_DIR)/.unpacked
|
||||||
|
|
||||||
$(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked
|
$(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked
|
||||||
|
@ -83,78 +84,78 @@ $(TARGET_DIR)/usr/bin/ssh: $(OPENSSH_DIR)/ssh
|
||||||
|
|
||||||
openssh: $(TARGET_DIR)/usr/bin/ssh
|
openssh: $(TARGET_DIR)/usr/bin/ssh
|
||||||
|
|
||||||
$(OPENSSH_IPK_DIR)/usr/bin/ssh: $(OPENSSH_DIR)/ssh
|
$(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh: $(OPENSSH_DIR)/ssh
|
||||||
$(MAKE) CC=$(TARGET_CC) DESTDIR=$(OPENSSH_IPK_DIR) -C $(OPENSSH_DIR) install
|
$(MAKE) CC=$(TARGET_CC) DESTDIR=$(OPENSSH_IPK_BUILD_DIR) -C $(OPENSSH_DIR) install
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/etc/init.d/
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/etc/init.d/
|
||||||
cp $(OPENSSH_DIR)/S50sshd $(OPENSSH_IPK_DIR)/etc/init.d/
|
cp $(OPENSSH_DIR)/S50sshd $(OPENSSH_IPK_BUILD_DIR)/etc/init.d/
|
||||||
chmod a+x $(OPENSSH_IPK_DIR)/etc/init.d/S50sshd
|
chmod a+x $(OPENSSH_IPK_BUILD_DIR)/etc/init.d/S50sshd
|
||||||
rm -rf $(OPENSSH_IPK_DIR)/usr/info $(OPENSSH_IPK_DIR)/usr/man $(OPENSSH_IPK_DIR)/usr/share/doc
|
rm -rf $(OPENSSH_IPK_BUILD_DIR)/usr/info $(OPENSSH_IPK_BUILD_DIR)/usr/man $(OPENSSH_IPK_BUILD_DIR)/usr/share/doc
|
||||||
|
|
||||||
$(OPENSSH_SERVER_IPK): $(OPENSSH_IPK_DIR)/usr/bin/ssh
|
$(OPENSSH_SERVER_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
|
||||||
rm -rf $(OPENSSH_IPK_DIR)/build
|
rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/CONTROL
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.server.control $(OPENSSH_IPK_DIR)/build/CONTROL/control
|
cp $(OPENSSH_IPK_DIR)/openssh.server.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.server.conffiles $(OPENSSH_IPK_DIR)/build/CONTROL/conffiles
|
cp $(OPENSSH_IPK_DIR)/openssh.server.conffiles $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/conffiles
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.server.preinst $(OPENSSH_IPK_DIR)/build/CONTROL/preinst
|
cp $(OPENSSH_IPK_DIR)/openssh.server.preinst $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/preinst
|
||||||
chmod a+x $(OPENSSH_IPK_DIR)/build/CONTROL/preinst
|
chmod a+x $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/preinst
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.server.postinst $(OPENSSH_IPK_DIR)/build/CONTROL/postinst
|
cp $(OPENSSH_IPK_DIR)/openssh.server.postinst $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/postinst
|
||||||
chmod a+x $(OPENSSH_IPK_DIR)/build/CONTROL/postinst
|
chmod a+x $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/postinst
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/etc/init.d
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/etc/init.d
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.server.sshd_config $(OPENSSH_IPK_DIR)/build/etc/sshd_config
|
cp $(OPENSSH_IPK_DIR)/openssh.server.sshd_config $(OPENSSH_IPK_BUILD_DIR)/build/etc/sshd_config
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.server.S50sshd-ipk $(OPENSSH_IPK_DIR)/build/etc/init.d/S50sshd
|
cp $(OPENSSH_IPK_DIR)/openssh.server.S50sshd-ipk $(OPENSSH_IPK_BUILD_DIR)/build/etc/init.d/S50sshd
|
||||||
chmod a+x $(OPENSSH_IPK_DIR)/build/etc/init.d/S50sshd
|
chmod a+x $(OPENSSH_IPK_BUILD_DIR)/build/etc/init.d/S50sshd
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/usr/sbin
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
|
||||||
cp $(OPENSSH_IPK_DIR)/usr/sbin/sshd $(OPENSSH_IPK_DIR)/build/usr/sbin
|
cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/sshd $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/usr/bin
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
|
||||||
cp $(OPENSSH_IPK_DIR)/usr/bin/ssh-keygen $(OPENSSH_IPK_DIR)/build/usr/bin
|
cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-keygen $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
|
||||||
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_DIR)/build
|
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
rm -rf $(OPENSSH_IPK_DIR)/build
|
rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
|
|
||||||
$(OPENSSH_CLIENT_IPK): $(OPENSSH_IPK_DIR)/usr/bin/ssh
|
$(OPENSSH_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
|
||||||
rm -rf $(OPENSSH_IPK_DIR)/build
|
rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/CONTROL
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.client.control $(OPENSSH_IPK_DIR)/build/CONTROL/control
|
cp $(OPENSSH_IPK_DIR)/openssh.client.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.client.conffiles $(OPENSSH_IPK_DIR)/build/CONTROL/conffiles
|
cp $(OPENSSH_IPK_DIR)/openssh.client.conffiles $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/conffiles
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.client.preinst $(OPENSSH_IPK_DIR)/build/CONTROL/preinst
|
cp $(OPENSSH_IPK_DIR)/openssh.client.preinst $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/preinst
|
||||||
chmod a+x $(OPENSSH_IPK_DIR)/build/CONTROL/preinst
|
chmod a+x $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/preinst
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/etc
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/etc
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.client.ssh_config $(OPENSSH_IPK_DIR)/build/etc/ssh_config
|
cp $(OPENSSH_IPK_DIR)/openssh.client.ssh_config $(OPENSSH_IPK_BUILD_DIR)/build/etc/ssh_config
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/usr/bin
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
|
||||||
cp $(OPENSSH_IPK_DIR)/usr/bin/ssh $(OPENSSH_IPK_DIR)/build/usr/bin
|
cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
|
||||||
cp $(OPENSSH_IPK_DIR)/usr/bin/scp $(OPENSSH_IPK_DIR)/build/usr/bin
|
cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/scp $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
|
||||||
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_DIR)/build
|
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
rm -rf $(OPENSSH_IPK_DIR)/build
|
rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
|
|
||||||
$(OPENSSH_SFTP_SERVER_IPK): $(OPENSSH_IPK_DIR)/usr/bin/ssh
|
$(OPENSSH_SFTP_SERVER_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
|
||||||
rm -rf $(OPENSSH_IPK_DIR)/build
|
rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/CONTROL
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.sftp-server.control $(OPENSSH_IPK_DIR)/build/CONTROL/control
|
cp $(OPENSSH_IPK_DIR)/openssh.sftp-server.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/usr/sbin
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
|
||||||
cp $(OPENSSH_IPK_DIR)/usr/sbin/sftp-server $(OPENSSH_IPK_DIR)/build/usr/sbin
|
cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/sftp-server $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
|
||||||
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_DIR)/build
|
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
rm -rf $(OPENSSH_IPK_DIR)/build
|
rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
|
|
||||||
$(OPENSSH_SFTP_CLIENT_IPK): $(OPENSSH_IPK_DIR)/usr/bin/ssh
|
$(OPENSSH_SFTP_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
|
||||||
rm -rf $(OPENSSH_IPK_DIR)/build
|
rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/CONTROL
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.sftp-client.control $(OPENSSH_IPK_DIR)/build/CONTROL/control
|
cp $(OPENSSH_IPK_DIR)/openssh.sftp-client.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/usr/bin
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
|
||||||
cp $(OPENSSH_IPK_DIR)/usr/bin/sftp $(OPENSSH_IPK_DIR)/build/usr/bin
|
cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/sftp $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
|
||||||
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_DIR)/build
|
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
rm -rf $(OPENSSH_IPK_DIR)/build
|
rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
|
|
||||||
$(OPENSSH_CLIENT_EX_IPK): $(OPENSSH_IPK_DIR)/usr/bin/ssh
|
$(OPENSSH_CLIENT_EX_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
|
||||||
rm -rf $(OPENSSH_IPK_DIR)/build
|
rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/CONTROL
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL
|
||||||
cp $(SOURCE_DIR)/openwrt/ipkg/openssh/openssh.client.ex.control $(OPENSSH_IPK_DIR)/build/CONTROL/control
|
cp $(OPENSSH_IPK_DIR)/openssh.client.ex.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/usr/bin
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
|
||||||
cp $(OPENSSH_IPK_DIR)/usr/bin/ssh-add $(OPENSSH_IPK_DIR)/build/usr/bin
|
cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-add $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
|
||||||
cp $(OPENSSH_IPK_DIR)/usr/bin/ssh-agent $(OPENSSH_IPK_DIR)/build/usr/bin
|
cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-agent $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
|
||||||
cp $(OPENSSH_IPK_DIR)/usr/bin/ssh-keyscan $(OPENSSH_IPK_DIR)/build/usr/bin
|
cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-keyscan $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
|
||||||
mkdir -p $(OPENSSH_IPK_DIR)/build/usr/sbin
|
mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
|
||||||
cp $(OPENSSH_IPK_DIR)/usr/sbin/ssh-keysign $(OPENSSH_IPK_DIR)/build/usr/sbin
|
cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/ssh-keysign $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
|
||||||
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_DIR)/build
|
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
rm -rf $(OPENSSH_IPK_DIR)/build
|
rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
|
||||||
|
|
||||||
openssh-ipk: $(OPENSSH_SERVER_IPK) $(OPENSSH_CLIENT_IPK) \
|
openssh-ipk: $(OPENSSH_SERVER_IPK) $(OPENSSH_CLIENT_IPK) \
|
||||||
$(OPENSSH_SFTP_SERVER_IPK) $(OPENSSH_SFTP_CLIENT_IPK) \
|
$(OPENSSH_SFTP_SERVER_IPK) $(OPENSSH_SFTP_CLIENT_IPK) \
|
||||||
|
|
|
@ -8,9 +8,10 @@
|
||||||
OPENSSL_SITE:=http://www.openssl.org/source
|
OPENSSL_SITE:=http://www.openssl.org/source
|
||||||
OPENSSL_SOURCE:=openssl-0.9.7d.tar.gz
|
OPENSSL_SOURCE:=openssl-0.9.7d.tar.gz
|
||||||
OPENSSL_DIR:=$(BUILD_DIR)/openssl-0.9.7d
|
OPENSSL_DIR:=$(BUILD_DIR)/openssl-0.9.7d
|
||||||
OPENSSL_PATCH=$(SOURCE_DIR)/openssl.patch
|
OPENSSL_IPK_DIR=$(OPENWRT_IPK_DIR)/openssl
|
||||||
|
OPENSSL_PATCH=$(OPENSSL_IPK_DIR)/openssl.patch
|
||||||
|
|
||||||
OPENSSL_IPK_DIR=$(BUILD_DIR)/openssl-0.9.7d-ipk
|
OPENSSL_IPK_BUILD_DIR=$(BUILD_DIR)/openssl-0.9.7d-ipk
|
||||||
LIBSSL_IPK=$(BUILD_DIR)/libssl_0.9.7d_mipsel.ipk
|
LIBSSL_IPK=$(BUILD_DIR)/libssl_0.9.7d_mipsel.ipk
|
||||||
|
|
||||||
$(DL_DIR)/$(OPENSSL_SOURCE):
|
$(DL_DIR)/$(OPENSSL_SOURCE):
|
||||||
|
@ -68,15 +69,15 @@ openssl-headers: $(TARGET_DIR)/usr/lib/libssl.a
|
||||||
|
|
||||||
openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7
|
openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7
|
||||||
|
|
||||||
$(LIBSSL_IPK): uclibc $(STAGING_DIR)/usr/lib/libcrypto.a
|
$(LIBSSL_IPK): uclibc $(STAGING_DIR)/lib/libcrypto.a
|
||||||
mkdir -p $(OPENSSL_IPK_DIR)/CONTROL
|
mkdir -p $(OPENSSL_IPK_BUILD_DIR)/CONTROL
|
||||||
cp $(SOURCE_DIR)/openwrt/openssl/control $(OPENSSL_IPK_DIR)/CONTROL/control
|
cp $(OPENSSL_IPK_DIR)/control $(OPENSSL_IPK_BUILD_DIR)/CONTROL/control
|
||||||
mkdir -p $(OPENSSL_IPK_DIR)/usr/lib
|
mkdir -p $(OPENSSL_IPK_BUILD_DIR)/usr/lib
|
||||||
cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(OPENSSL_IPK_DIR)/usr/lib/
|
cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(OPENSSL_IPK_BUILD_DIR)/usr/lib/
|
||||||
cp -fa $(STAGING_DIR)/lib/libssl.so* $(OPENSSL_IPK_DIR)/usr/lib/
|
cp -fa $(STAGING_DIR)/lib/libssl.so* $(OPENSSL_IPK_BUILD_DIR)/usr/lib/
|
||||||
-$(STRIP) --strip-unneeded $(OPENSSL_IPK_DIR)/usr/lib/libssl.so.0.9.7
|
-$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libssl.so.0.9.7
|
||||||
-$(STRIP) --strip-unneeded $(OPENSSL_IPK_DIR)/usr/lib/libcrypto.so.0.9.7
|
-$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libcrypto.so.0.9.7
|
||||||
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSL_IPK_DIR)
|
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSL_IPK_BUILD_DIR)
|
||||||
|
|
||||||
openssl-ipk: $(LIBSSL_IPK)
|
openssl-ipk: $(LIBSSL_IPK)
|
||||||
|
|
||||||
|
@ -86,6 +87,7 @@ openssl-clean:
|
||||||
rm -f $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/openssl
|
rm -f $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/openssl
|
||||||
rm -f $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/lib/libcrypto.so*
|
rm -f $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/lib/libcrypto.so*
|
||||||
rm -f $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/lib/libssl.so*
|
rm -f $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/lib/libssl.so*
|
||||||
|
rm -rf $(OPENSSL_IPK_BUILD_DIR)
|
||||||
$(MAKE) -C $(OPENSSL_DIR) clean
|
$(MAKE) -C $(OPENSSL_DIR) clean
|
||||||
|
|
||||||
openssl-dirclean:
|
openssl-dirclean:
|
||||||
|
|
|
@ -6,57 +6,56 @@
|
||||||
# .patched-pppoecd in the pppd directory.
|
# .patched-pppoecd in the pppd directory.
|
||||||
|
|
||||||
PPPD_DIR=$(BUILD_DIR)/WRT54GS/release/src/router/ppp/pppd
|
PPPD_DIR=$(BUILD_DIR)/WRT54GS/release/src/router/ppp/pppd
|
||||||
PPPD_PATCH=$(SOURCE_DIR)/pppoecd-pathnames.patch
|
PPPD_PATCH_DIR=$(OPENWRT_IPK_DIR)/pppoecd
|
||||||
|
|
||||||
PPPOECD_DIR=$(BUILD_DIR)/WRT54GS/release/src/router/ppp/pppoecd
|
PPPOECD_DIR=$(BUILD_DIR)/WRT54GS/release/src/router/ppp/pppoecd
|
||||||
PPPOECD_PATCH=$(SOURCE_DIR)/pppoecd.patch
|
PPPOECD_IPK_DIR=$(OPENWRT_IPK_DIR)/pppoecd
|
||||||
PPPOECD_BIN=$(TARGET_DIR)/sbin/pppoecd
|
PPPOECD_IPK_BUILD_DIR=$(BUILD_DIR)/pppoecd-1.0
|
||||||
|
|
||||||
PPPOECD_IPK_DIR=$(BUILD_DIR)/pppoecd-1.0
|
|
||||||
PPPOECD_PACKAGE=$(BUILD_DIR)/pppoecd_1.0_mipsel.ipk
|
PPPOECD_PACKAGE=$(BUILD_DIR)/pppoecd_1.0_mipsel.ipk
|
||||||
PPPOECD_IPK_BIN=$(PPPOECD_IPK_DIR)/sbin/pppoecd
|
PPPOECD_BIN=$(TARGET_DIR)/sbin/pppoecd
|
||||||
|
PPPOECD_IPK_BIN=$(PPPOECD_IPK_BUILD_DIR)/sbin/pppoecd
|
||||||
|
|
||||||
# patch pppd for the openwrt compatible path names
|
# patch pppd for the openwrt compatible path names
|
||||||
$(PPPD_DIR)/.patched-pppoecd: $(BUILD_DIR)/WRT54GS/.source
|
$(PPPD_DIR)/.patched-pppoecd: $(BUILD_DIR)/WRT54GS/.source
|
||||||
cat $(PPPD_PATCH) | patch -d $(PPPD_DIR)
|
cat $(PPPD_PATCH_DIR)/pppoecd-pathnames.patch | patch -d $(PPPD_DIR)
|
||||||
touch $(PPPD_DIR)/.patched-pppoecd
|
touch $(PPPD_DIR)/.patched-pppoecd
|
||||||
|
|
||||||
# patch the pppoecd itself for GCC3.x compatibility and to move pppoecd to /sbin
|
# patch the pppoecd itself for GCC3.x compatibility and to move pppoecd to /sbin
|
||||||
$(PPPOECD_DIR)/.patched: $(PPPD_DIR)/.patched-pppoecd
|
$(PPPOECD_DIR)/.patched: $(PPPD_DIR)/.patched-pppoecd
|
||||||
cat $(PPPOECD_PATCH) | patch -d $(PPPOECD_DIR)
|
cat $(PPPOECD_IPK_DIR)/pppoecd.patch | patch -d $(PPPOECD_DIR)
|
||||||
touch $(PPPOECD_DIR)/.patched
|
touch $(PPPOECD_DIR)/.patched
|
||||||
|
|
||||||
# build the pppoecd binary for the ipk version
|
# build the pppoecd binary for the ipk version
|
||||||
$(PPPOECD_IPK_BIN): $(PPPOECD_DIR)/.patched
|
$(PPPOECD_IPK_BIN): $(PPPOECD_DIR)/.patched
|
||||||
mkdir -p $(PPPOECD_IPK_DIR)/etc/ppp
|
mkdir -p $(PPPOECD_IPK_BUILD_DIR)/etc/ppp
|
||||||
cp $(SOURCE_DIR)/pppoecd.ip-up $(PPPOECD_IPK_DIR)/etc/ppp/ip-up
|
cp $(PPPOECD_IPK_DIR)/root/etc/ppp/ip-up $(PPPOECD_IPK_BUILD_DIR)/etc/ppp/ip-up
|
||||||
chmod a+x $(PPPOECD_IPK_DIR)/etc/ppp/ip-up
|
chmod a+x $(PPPOECD_IPK_BUILD_DIR)/etc/ppp/ip-up
|
||||||
$(MAKE) -C $(PPPOECD_DIR) CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
|
$(MAKE) -C $(PPPOECD_DIR) CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
|
||||||
SRCBASE=$(OPENWRT_SRCBASE) INSTALLDIR=$(PPPOECD_IPK_DIR) LIBDIR=$(UCLIBC_DIR)/lib \
|
SRCBASE=$(OPENWRT_SRCBASE) INSTALLDIR=$(PPPOECD_IPK_BUILD_DIR) LIBDIR=$(UCLIBC_DIR)/lib \
|
||||||
STRIP="$(STRIP)" \
|
STRIP="$(STRIP)" \
|
||||||
install
|
install
|
||||||
|
|
||||||
# setup ipkg control files
|
# setup ipkg control files
|
||||||
$(PPPOECD_IPK_DIR)/CONTROL/control:
|
$(PPPOECD_IPK_BUILD_DIR)/CONTROL/control:
|
||||||
mkdir -p $(PPPOECD_IPK_DIR)/CONTROL
|
mkdir -p $(PPPOECD_IPK_BUILD_DIR)/CONTROL
|
||||||
cp $(SOURCE_DIR)/pppoecd.prerm $(PPPOECD_IPK_DIR)/CONTROL/prerm
|
cp $(PPPOECD_IPK_DIR)/CONTROL/prerm $(PPPOECD_IPK_BUILD_DIR)/CONTROL/prerm
|
||||||
chmod a+x $(PPPOECD_IPK_DIR)/CONTROL/prerm
|
chmod a+x $(PPPOECD_IPK_BUILD_DIR)/CONTROL/prerm
|
||||||
cp $(SOURCE_DIR)/pppoecd.postrm $(PPPOECD_IPK_DIR)/CONTROL/postrm
|
cp $(PPPOECD_IPK_DIR)/CONTROL/postrm $(PPPOECD_IPK_BUILD_DIR)/CONTROL/postrm
|
||||||
chmod a+x $(PPPOECD_IPK_DIR)/CONTROL/postrm
|
chmod a+x $(PPPOECD_IPK_BUILD_DIR)/CONTROL/postrm
|
||||||
cp $(SOURCE_DIR)/pppoecd.conffiles $(PPPOECD_IPK_DIR)/CONTROL/conffiles
|
cp $(PPPOECD_IPK_DIR)/CONTROL/conffiles $(PPPOECD_IPK_BUILD_DIR)/CONTROL/conffiles
|
||||||
cp $(SOURCE_DIR)/pppoecd.control $(PPPOECD_IPK_DIR)/CONTROL/control
|
cp $(PPPOECD_IPK_DIR)/CONTROL/control $(PPPOECD_IPK_BUILD_DIR)/CONTROL/control
|
||||||
|
|
||||||
# build the ipk package
|
# build the ipk package
|
||||||
$(PPPOECD_PACKAGE): $(PPPOECD_IPK_BIN) $(PPPOECD_IPK_DIR)/CONTROL/control
|
$(PPPOECD_PACKAGE): $(PPPOECD_IPK_BIN) $(PPPOECD_IPK_BUILD_DIR)/CONTROL/control
|
||||||
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root pppoecd-1.0
|
cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(PPPOECD_IPK_BUILD_DIR)
|
||||||
|
|
||||||
# main target for building the ipk version
|
# main target for building the ipk version
|
||||||
pppoecd-ipk: $(PPPOECD_PACKAGE)
|
pppoecd-ipk: $(PPPOECD_PACKAGE)
|
||||||
|
|
||||||
# the embedded binary
|
# the embedded binary
|
||||||
$(PPPOECD_BIN): $(PPPOECD_DIR)/.patched
|
$(PPPOECD_BIN): $(PPPOECD_DIR)/.patched
|
||||||
mkdir $(TARGET_DIR)/etc/ppp
|
mkdir -p $(TARGET_DIR)/etc/ppp
|
||||||
cp $(SOURCE_DIR)/pppoecd.ip-up $(TARGET_DIR)/etc/ppp/ip-up
|
cp $(PPPOECD_IPK_DIR)/root/etc/ppp/ip-up $(TARGET_DIR)/etc/ppp/ip-up
|
||||||
chmod a+x $(TARGET_DIR)/etc/ppp/ip-up
|
chmod a+x $(TARGET_DIR)/etc/ppp/ip-up
|
||||||
$(MAKE) -C $(PPPOECD_DIR) CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
|
$(MAKE) -C $(PPPOECD_DIR) CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
|
||||||
SRCBASE=$(OPENWRT_SRCBASE) INSTALLDIR=$(TARGET_DIR) LIBDIR=$(UCLIBC_DIR)/lib \
|
SRCBASE=$(OPENWRT_SRCBASE) INSTALLDIR=$(TARGET_DIR) LIBDIR=$(UCLIBC_DIR)/lib \
|
||||||
|
@ -69,5 +68,5 @@ pppoecd: $(PPPOECD_BIN)
|
||||||
pppoecd-clean:
|
pppoecd-clean:
|
||||||
-$(MAKE) -C $(PPPOECD_DIR) clean
|
-$(MAKE) -C $(PPPOECD_DIR) clean
|
||||||
rm -f $(TARGET_DIR)/usr/sbin/pppoecd
|
rm -f $(TARGET_DIR)/usr/sbin/pppoecd
|
||||||
rm -rf $(PPPOECD_IPK_DIR)
|
rm -rf $(PPPOECD_IPK_BUILD_DIR)
|
||||||
rm -f $(PPPOECD_PACKAGE)
|
rm -f $(PPPOECD_PACKAGE)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
Package: openssl
|
Package: libssl
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Version: 0.9.7d-1
|
Version: 0.9.7d-1
|
||||||
Architecture: mipsel
|
Architecture: mipsel
|
||||||
|
|
Loading…
Reference in a new issue