Skip to content

Commit 99cb9b5

Browse files
committed
add separate make targets for block dev
1 parent 3794c48 commit 99cb9b5

File tree

6 files changed

+52
-12
lines changed

6 files changed

+52
-12
lines changed

Makefile

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,33 @@ lib_remove:
8080
lib_reinsert:
8181
$(MAKE) lib_remove && $(MAKE) lib_insert
8282

83+
# ---------------- Block dev only ----------------
84+
85+
.PHONY: bdev
86+
bdev:
87+
$(MAKE) -j -C $(KERNEL_SOURCES_DIR) M=$(BDEV) MO=$(OUTPUT_BDEV) modules
88+
89+
.PHONY: bdev_install
90+
bdev_install:
91+
$(MAKE) -j -C $(KERNEL_SOURCES_DIR) M=$(BDEV) MO=$(OUTPUT_BDEV) modules_install
92+
93+
.PHONY: bdev_clean
94+
bdev_clean:
95+
$(MAKE) -j -C $(KERNEL_SOURCES_DIR) M=$(BDEV) MO=$(OUTPUT_BDEV) clean
96+
rm -rf $(OUTPUT_BDEV)
97+
98+
.PHONY: bdev_insert
99+
bdev_insert:
100+
insmod $(BDEV_OBJ)
101+
102+
.PHONY: bdev_remove
103+
bdev_remove:
104+
rmmod $(BDEV_NAME) || true
105+
106+
.PHONY: bdev_reinsert
107+
bdev_reinsert:
108+
$(MAKE) bdev_remove && $(MAKE) bdev_insert
109+
83110
# ---------------- Testing ----------------
84111

85112
.PHONY: test
File renamed without changes.

lz4e_bdev/Kbuild

Lines changed: 0 additions & 10 deletions
This file was deleted.

lz4e_bdev/Makefile

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
include $(PWD)/flags.mk
2+
3+
ccflags-y += -I $(PWD)/lz4e
4+
5+
SYMBOLS_ALL := $(PWD)/build/Module.symvers
6+
SYMBOLS_LIB := $(PWD)/build/lz4e/Module.symvers
7+
8+
ifneq ("$(wildcard $(SYMBOLS_ALL))", "")
9+
KBUILD_EXTRA_SYMBOLS += $(SYMBOLS_ALL)
10+
else
11+
KBUILD_EXTRA_SYMBOLS += $(SYMBOLS_LIB)
12+
endif
13+
14+
$(info KBUILD_EXTRA_SYMBOLS = $(KBUILD_EXTRA_SYMBOLS))
15+
16+
lz4e_bdev-y := lz4e_module.o \
17+
lz4e_dev.o \
18+
lz4e_under_dev.o \
19+
lz4e_req.o \
20+
lz4e_chunk.o \
21+
lz4e_stats.o
22+
23+
obj-m := lz4e_bdev.o

lz4e_bdev/lz4e_chunk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "include/lz4e_chunk.h"
1515

16-
#include "../lz4e/include/lz4e.h"
16+
#include "include/lz4e.h"
1717
#include "include/lz4e_static.h"
1818

1919
void lz4e_buf_copy_from_bio(struct lz4e_buffer *dst, struct bio *src)

lz4e_bdev/lz4e_req.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include "include/lz4e_req.h"
1919

20-
#include "../lz4e/include/lz4e.h"
20+
#include "include/lz4e.h"
2121
#include "include/lz4e_chunk.h"
2222
#include "include/lz4e_dev.h"
2323
#include "include/lz4e_static.h"

0 commit comments

Comments
 (0)